summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Clarify cClientHandle, cPlayer ownership semanticsTiger Wang2021-01-121-251/+207
| | | | | | | | + A cPlayer, once created, has a strong pointer to the cClientHandle. The player ticks the clienthandle. If he finds the handle destroyed, he destroys himself in turn. Nothing else can kill the player. * The client handle has a pointer to the player. Once a player is created, the client handle never outlasts the player, nor does it manage the player's lifetime. The pointer is always safe to use after FinishAuthenticate, which is also the point where cProtocol is put into the Game state that allows player manipulation. + Entities are once again never lost by constructing a chunk when they try to move into one that doesn't exist. * Fixed a forgotten Super invocation in cPlayer::OnRemoveFromWorld. * Fix SaveToDisk usage in destructor by only saving things cPlayer owns, instead of accessing cWorld.
* Fix potential destruction crashes (#5095)Tiger Wang2021-01-021-2/+1
| | | | | | | | | | * 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
* Added magma block contact damage (#5055)Aiden Neill2020-11-251-0/+1
| | | | | | * Added magma block contact damage * Fireproof entities do not take damage from magma * Fire resistance prevents magma damage * No magma damage when hovering over magma block
* Players are no longer kicked when clicking on bedrock (#5023)Tiger Wang2020-11-061-18/+8
| | | | * Players are no longer kicked when clicking on bedrock * Fixes #5022
* added const correctness on some functions in cPlayer (#4999)12xx122020-10-151-2/+2
| | | Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Fix cmake not adding Werror on clang, and _lots_ of warnings (#4963)peterbell102020-10-051-3/+3
| | | | | | | | | | | | | | | * Fix cmake not adding Werror on clang, and _lots_ of warnings * WIP: Build fixes * Cannot make intermediate blockhandler instance * Tiger's changes * Fix BitIndex check * Handle invalid NextState values in cMultiVersionProtocol Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Fix instant mining of blocks not being recognised, tweak anti-cheat (#4938)KingCol132020-10-021-19/+67
| | | | | | | | | | | | | | | | | | | * Tried to fix a small issue... Ended up rewriting a bunch of god awful, opaque code with no source and no sense. Who names a function GetPlayerRelativeBlockHardness??? It's gone now. We're safe again. * Testing anti-cheat. * Tidy up debug logging. * Remove empty member declaration. * Rewrite GetDigSpeed slightly for better readability. * GetMiningProgressPerTick now returns 1 when instantly mined. Fixed hasily written typo. * Comment style and typo fixes.
* Enchanting table shows detail on hover. Enchanting is deterministic. (#4937)KingCol132020-10-011-0/+23
| | | | | * Use lapis for enchanting, subtract correct number of levels, ClientHandle now selects from pregenerated list. Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Added dtEnvitonment to player damage text (#4925)12xx122020-09-221-0/+1
| | | | + Added dtEnvironment to string conversion + Added dtEnvironment to player damage strings
* BlockHandler initialisation is a constant expression (#4891)Tiger Wang2020-09-201-4/+2
| | | | | | | | | | | | | * BlockHandler initialisation is a constant expression If we can't make it all namespaces, this is the next best I guess. + Tag handlers constexpr, const as needed + Inherit constructors * Privatise handler functions * More constexpr Co-authored-by: Alexander Harkness <me@bearbin.net>
* Add more statistic tracking (#4837)12xx122020-09-051-5/+30
| | | | | | | | + 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>
* Make StatSerializer a namespaceTiger Wang2020-08-211-4/+2
|
* Add Statistics and Achievements for newer Network standards12xx122020-08-191-56/+57
|
* OnBroken/OnPlaced are for entity actionsTiger Wang2020-08-041-8/+6
| | | | | | * Call OnPlaced/OnBroken in PlaceBlock/DigBlock - Remove unused Placing/Breaking handlers * Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors
* Precompile unordered_map/setTiger Wang2020-07-191-2/+0
| | | | | | + Add inclusions to Globals.h * Sort Globals.h - Remove sys/stat.h from Globals.h
* Introduce recipe book functionality (#4493)Tobias Wilken2020-07-141-10/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce recipe book functionality The recipe book helps especially new players. Missing it gives the impression that cuberite is not as advanced as it is. The handling of the recipe book uses the following functions: - Unlock Recipes (https://wiki.vg/index.php?title=Protocol&oldid=14204#Unlock_Recipes) to make recipes available and show the notification for new recipes. Initialization is done on player login for known ones, the update is done when new items are discovered. - Craft Recipe Request (https://wiki.vg/index.php?title=Protocol&oldid=14204#Craft_Recipe_Request) when the user selects a recipe from the recipe book to fill the slots. Known recipes are initialized on player login via `Unlock Recipes` with `Action` 0. As soon as a new recipe is discovered this is added via `Unlock Recipes` with `Action` 1. To be able to know and recognize new recipes the player class is extended with `KnownItems` and `KnownRecipes`. As soon as a player touches an item this is compared to the list of `KnownItems`, if the item is unknown the recipes are checked for this item and the other ingredients are checked with the list of `KnownItems`. If a full match is discovered the recipe is unlocked with the client and stored in the `KnownRecipes`. To unlock recipes the recipe ID is sent to the client. A mapping file (for protocol 1.12.2) translated the minecraft recipe names to ids. The crafting.txt is extended with and minecraft recipe names is possible. Limitations: Only a single recipe is added to the crafting area. Multiple clicks or shift click does not increase the number of builds. Co-authored-by: peterbell10 <peterbell10@live.co.uk> * Address first issues mentioned by @peterbell10 - Some linting - Extract loading of recipe specific protocol mapping into a function - Build `RecipeNameMap` only once - Use `std::optional` - Extract `LoadRecipe` from `Window` * Start to implement new suggestions * Update with suggestions from @peterbell10 * Some minor cleanup * Update protocol packet IDs * Remove unused include * Include header in cmake * Change a vector to integer counter * Change dromedaryCase method names to PascalCase * Address suggestions from @madmaxoft * Read Protocol subdirectories to load recipe books To load all recipebooks iterate over the `Protocol` subdirectories to find mapping files. Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Enable some more clang-tidy linter checks (#4738)peterbell102020-05-151-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-6/+8
| | | | | | | | | | | | | 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.
* Remove old Android leftovers (#4722)Mat2020-05-071-2/+2
|
* Improve entity position updates (#4701)Tiger Wang2020-05-041-21/+19
| | | | | | | | | * Make puking pickups fly nicer * Improve entity position updates * Move determination of whether a delta is too big for a packet into the protocol handlers + Less jittery movement + Generalise CollectEntity to take any entity
* Add cEntity::GetBoundingBox, and use where appropriate. (#4711)Alexander Harkness2020-05-031-1/+1
| | | * Add cEntity::GetBoundingBox, and use where appropriate.
* MoveToWorld must always be provided a worldTiger Wang2020-04-181-1/+1
|
* Using Super.Mattes D2020-04-161-10/+10
|
* Replace buckets to the selected hotbar slot, rather than the first available. (#4580)Alexander Harkness2020-04-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* Fix explosion knockback issues and tweak knockback strength (#4590)peterbell102020-04-021-1/+1
|
* Lua API for spectating entities (#4518)Mat2020-03-301-2/+18
|
* Send respawn packet by default (#4540)Mat2020-03-241-1/+1
|
* Manual merge of #4498.Alexander Harkness2020-03-231-1/+6
| | | | | | Credit to @MeMuXin Closes #4498
* Don't remove items twice (#4524)Mat2020-03-221-4/+0
| | | * Don't remove items twice
* Improvements to knockback (#4504)Mat2020-03-191-4/+0
| | | | | * Improvements to knockback * SetSpeed for explosions * Improve code consistency
* Attached entities can't enter portals (#4484)Mat2020-03-051-0/+3
| | | | | | * Attached entities can't enter portals * Whitespace fixes
* Stabilise MoveToWorld (#4004)Mat2020-03-051-71/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stabilise MoveToWorld * Fix comments and deprecate ScheduleMoveToWorld * Enhanced thread safety for m_WorldChangeInfo * Return unique_ptr from cAtomicUniquePtr::exchange * cWorld now calls entity cEntity::OnAddToWorld and cEntity::OnRemoveFromWorld. Allows broadcasting entities added to the world from the world's tick thread. This also factors out some common code from cEntity::DoMoveToWorld and cEntity::Initialize. As a consequence, cEntity::Destroy(false) (i.e. Destroying the entity without broadcasting) is impossible. This isn't used anywhere in Cuberite so it's now deprecated. * Update entity position after removing it from the world. Fixes broadcasts being sent to the wrong chunk. * Fix style * cEntity: Update LastSentPosition when sending spawn packet * Add Wno-deprecated-declarations to the lua bindings * Kill uses of ScheduleMoveToWorld
* Fixed MSVC warnings (#4400)Mattes D2019-09-271-1/+1
|
* Fix mobs targeting dead players (#4344)Julius Oeftiger2019-08-161-1/+1
| | | | Fixes #4340
* Fix building with clang 8.0 (#4346)Bond-0092019-08-111-2/+2
|
* Make Nether portals spawn the player inside of them (#4325)DaPorkchop_2019-04-181-2/+2
| | | | | | Currently the player is spawned immediately in front of them. Simply changing `cNetherPortalScanner::OutOffset` to 0.5 wasn't enough, as the player would always be spawned on top of the portal, however checking for non-solid blocks instead of air fixes this.
* Add a formatting function for Vector3 (#4282)peterbell102018-09-241-4/+4
| | | | | | | | | | * 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-291-2/+2
| | | | | | | 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.
* solve new player login crash issue (#4285)changyong guo2018-08-171-1/+0
| | | | currently if new player login, server will crash during send player ability to client. this pull request solve this issue.
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-261-1/+4
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* cPawn: Reset last ground height in ResetPosition (#4261)peterbell102018-07-231-1/+0
| | | | | Prevents fall damage after teleporting/portaling to a lower height. Fixes #3457
* Rewrite explosion knock back (#4251)changyong guo2018-07-231-0/+28
| | | | | | | 1. Base knockback on an entity's bounding box intersection with the explosion 2. Armor blast protection reduces knockback 3. Don't apply knockback to players flying in creative mode Fixes #4139
* Keep players in gmNotSet (#4248)changyong guo2018-07-231-27/+29
| | | | This allows players game mode to update to the default after portal to another world. Fixes #4207
* recover hotbar selected slot after reconnect (#4249)changyong guo2018-07-231-0/+17
| | | | | | | 1. implement protocol message SendHeldItemChange 2. add save / load inventory equipped item slot in JSON 3. send held item slot message after player connect to server Fixes #4189
* Make offline UUIDs consistent with vanilla. (#4178)peterbell102018-07-201-4/+55
| | | | | Fixes #4177 This is a breaking change to existing Cuberite permissions settings.
* Add unbreaking for armor (#4220)Bond-0092018-07-131-22/+33
| | | | | | Ref: minecraft.gamepedia.com/Enchanting#Unbreaking #915
* Prefer static_cast to reinterpret_cast (#4223)peterbell102018-05-021-4/+4
| | | | | | | * 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.
* Update m_LastSentPosition in TeleportToCoords and DoMoveToWorld. (#4211)peterbell102018-04-111-2/+2
|
* Deal with covered switches consistently (#4161)peterbell102018-02-051-29/+24
| | | | | | | * Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message()
* Rename cEntity swim states (#3996)Alexander Harkness2018-01-141-9/+1
| | | | | | | | | | * Replace cEntity:m_IsSubmerged with m_IsHeadInWater * Replace cEntity:m_IsSwimming with m_IsInWater * Add API documentation for new symbols * Apply SetSwimState to all entities, not just mobs and players * Pickups now use IsOnFire to check if they are on fire before destruction Fixes #3987
* Golden Apple Fixes (#4130)Alexander Harkness2018-01-061-0/+4
| | | | | | | | | * Do not remove food item until player has been fed * Golden apples now ignore hunger when eating * Removed EnchantedGoldenApple recipe, as it was removed in 1.9 Reference: https://minecraft.gamepedia.com/1.9#Items_2 * Adjust golden apple effects, as they were changed in 1.9 Reference: https://minecraft.gamepedia.com/1.9#Items_2
* Item durability loss now depends on the item used. (#4123)Alexander Harkness2018-01-051-19/+24
| | | | | | | Armour durability also no longer changes when it is used to break blocks or attack mobs. Fixes #4119
* Implement horse inventory (#4053)peterbell102017-10-211-0/+30
| | | | | | | | | | * Implement horse inventory * Fix sign conversions * Add API doc for ItemCategory::IsHorseArmor * Improve HandleOpenHorseInventory comment and style fixes.
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-191-1/+1
| | | | | | | | | | | | | | | | | | * 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
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-111-56/+17
|
* Made world data paths adjustable, and added API to temporarily disable saving chunks to disk. (#3912)Lane Kolbly2017-09-071-2/+2
|
* Switched player statistic store to save with UUID filenames. (#4002)Lane Kolbly2017-09-071-2/+2
|
* Fire effect now shown for creative and spectator mode players (#3998)Alexander Harkness2017-09-071-18/+0
| | | | | | | | * Fire effect now shown for creative and spectator mode players Fixes #3989 * Add documentation for IsFireproof
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-021-17/+56
| | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-011-56/+17
|
* Add cUUID class (#3871)peterbell102017-08-251-7/+6
|
* Minor changes (#3909)mathiascode2017-08-241-1/+1
|
* Changed MoveToWorld to ScheduleMoveToWorld in cPlayer::Respawn (#3922)Lane Kolbly2017-08-181-1/+1
| | | | | | * Changed MoveToWorld to ScheduleMoveToWorld - Removed empty line
* Merge pull request #3489 from cuberite/EntityOwnershipTiger Wang2017-08-181-5/+9
|\ | | | | * Changed entity ownership model to use smart pointers
| * Changed entity ownership model to use smart pointersTiger Wang2017-08-071-5/+9
| |
* | Add cLuaWindow OnClicked Callback (#3901)Lane Kolbly2017-08-171-0/+6
|/
* Implement invisibility effectpeterbell102017-08-031-4/+6
|
* Remove double includes part 2 (#3890)peterbell102017-08-031-2/+0
|
* Removed double includes (#3885)Lukas Pioch2017-08-021-1/+0
|
* cBlockHandler: take player by refpeterbell102017-08-011-1/+1
|
* cWorld::SendBlockTo take player by refpeterbell102017-08-011-2/+2
|
* Check for intersection between placed blocks and entities. (#3850)Lane Kolbly2017-07-281-0/+95
| | | | | | | | | | | | | * Check for intersection between placed blocks and entities. + Implemented GetPlacementCollisionBox, to permit custom placement collision boxes for blocks. * Factored block-entity placement checking into another function in cPlayer. - Removed vector min/max functions * Use GetWorld to get the world in DoesPlacingBlocksIntersectEntity. + Added block height checks, allow different cEntity subclasses to decide whether they will prevent block placement.
* Tentative fix for player-limit race condition (#3862)Tiger Wang2017-07-281-5/+0
| | | | | | | | | | * Attempts to fix #2257 Derived from d233e9843148313c71fbaba96ccff660e47b07b1 * Changed player count type to int * Clarified certain actions
* Updated armor cover calculation. (#3858)Lane Kolbly2017-07-231-11/+16
| | | | | | | | * Updated armor damage calculation. + Added lua docs, added casts from float to int. * Changed verbage in docstring and comment.
* Implemented draggingitem API.Lane Kolbly2017-07-101-0/+13
|
* Added armor durability reduction when player is attacked.Lane Kolbly2017-07-021-0/+12
|
* FastRandom rewrite (#3754)peterbell102017-06-131-7/+6
|
* Fixes problems with windows:Lukas Pioch2017-06-051-5/+5
| | | | | - Changed cPlayer:OpenWindow to accept a ref, tolua adds a nil check - Close open lua window in destructor, to avoid dangling pointers
* Add rank prefix and suffix to player name in chat (#3730)Heiko Hund2017-05-271-0/+18
| | | Fixes issue #1721
* Clang 5.0 fixesLukas Pioch2017-05-211-2/+3
| | | | | - Added override keyword - Removed inherited member variables
* Detach player from entity / object if he is deadLukas Pioch2017-03-191-0/+4
|
* Updated sounds and effect IDs (#3422)mathiascode2017-02-151-1/+1
|
* Track skin part and main hand preferences (#3498)Pokechu222017-01-031-1/+23
|
* Updated links and docs (#3488)mathiascode2016-12-191-1/+1
|
* Removed ClientHandle.h dependencies from common headers.Mattes D2016-11-181-2/+121
|
* Anticheat fastbreak (#3411)mohe20152016-11-061-0/+92
| | | Added block hardness checks when breaking blocks.
* Spectators added (#2852)bibo382016-10-121-0/+69
|
* Initialize m_bIsInBed in cPlayer constructor.sgtbigman2016-10-081-0/+1
| | | | | This fixes an issue where the return value from the IsInBed method of the cPlayer class in the lua API would not return a boolean value.
* Improve cPlayer::DoMoveToWorld (#3113)LogicParrot2016-09-031-36/+43
|
* Proper respawn packets on dimension travelLogicParrot2016-08-291-0/+9
|
* Delay EntityChangedWorld players' callback until Entity fully linked to world (#3330)ElNounch2016-08-221-2/+1
| | | | Otherwise, some API calls just don't seem to happen .gitignore tweak for test executables
* Fixed fall damageTiger Wang2016-06-021-1/+1
| | | | * Fixes #3216
* Fixed death on teleportation or leaving Minecart (#3181)LogicParrot2016-05-031-5/+9
|
* Fix crash on world travel (#3180)LogicParrot2016-05-031-1/+1
|
* Fix occasional freeze bugLogicParrot2016-04-131-35/+36
|
* Minor improvements to player freezeLogicParrot2016-04-051-1/+1
|
* Improved player freeze codeLogicParrot2016-04-051-44/+61
|
* Players never fall through unloaded chunks or end up inside solids on teleportLogicParrot2016-03-311-27/+80
|
* Player death crashfixLogicParrot2016-03-311-2/+4
|
* Bed's world is now savedLogicParrot2016-03-291-2/+38
|
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-27/+45
|
* remove cWorld::createAndInitializeWorldLogicParrot2016-02-081-1/+1
|
* cMonster::m_Target safety across worldsLogicParrot2016-02-031-1/+7
|
* Fixed cChunk::m_Entities corruption upon world travelLogicParrot2016-02-021-4/+14
|
* Improved tamed wolf pack cooperation and projectile reactionsLogicParrot2016-01-221-7/+9
|
* Fixed wrong knockback direction after explosion damageLogicParrot2016-01-161-0/+4
|
* Fix crash when tamed wolf is hit by arrowsLogicParrot2016-01-161-4/+7
|
* Merge pull request #2875 from LogicParrot/fallDamageLogicParrot2016-01-161-1/+5
|\ | | | | Fix fall damage crash when tamed wolves neabry
| * Fix fall damage crash when tamed wolves neabryLogicParrot2016-01-161-1/+5
| |
* | Limited the username length to 16 characters.bibo382016-01-131-0/+2
|/ | | | | | This fixes a client crash, because Minecraft requires that a username is not longer than 16 characters. See also: http://minecraft.gamepedia.com/The_Player#Name Fixes #2545
* Tamed wolf assists owner (attack / defence)LogicParrot2016-01-121-0/+39
|
* Fixed Clang warnings.Mattes D2016-01-061-1/+9
|
* Freeze player until chunk is loadedSafwat Halaby2015-12-251-0/+83
|
* blockheight mechanismGargaj2015-12-131-97/+0
|
* Avoid reading out of boundsGargaj2015-11-101-4/+14
| | | | as per https://github.com/cuberite/cuberite/pull/2630#discussion_r44377411
* fix shallow water + add future code for liquid fall dampeningGargaj2015-11-101-3/+11
|
* Debug mode: Fixed assertion, if player below y < 0Lukas Pioch2015-10-311-3/+3
|
* Spectator Mode doesn't fly[FIX]OdnetninI2015-10-051-0/+1
|
* Maked it compileable for clang-3.7Lukas Pioch2015-09-251-2/+2
|
* Namespace qualify std::abs, use explicit castMatti Hänninen2015-08-211-1/+1
| | | | | | | | | | Without 'std' namespace qualification Clang (at least Apple Clang 6.1) seems to resolve 'abs' to the 'abs' function in 'cstdlib'. This in turn triggers the 'absolute-value' warning which in turn is promoted to error. Implicit casts trigger 'old-style-cast' warnings which are promoted to errors.
* Fixed food drain bugsTiger Wang2015-08-201-160/+98
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-291-22/+22
|
* Merge pull request #2349 from cuberite/mapsTiger Wang2015-07-151-0/+5
|\ | | | | Improved maps
| * Improved mapsTiger Wang2015-07-141-0/+5
| |
* | Fix food drain on movement.LO1ZB2015-07-141-11/+10
|/
* Added HOOK_KILLEDNounours Heureux2015-06-131-6/+19
|
* Implemented nether portal scanning code.Lane Kolbly2015-06-101-4/+3
|
* Fix gamemode not changing properly.Alexander Harkness2015-05-231-64/+71
| | | | Should fix #604
* Merge pull request #2103 from beeduck/Issue1980Alexander Harkness2015-05-231-0/+9
|\ | | | | Fixed players head visible when in spectator mode
| * Fixed players head visible when in spectator modeb33duck2015-05-221-0/+9
| |
* | Merge pull request #2104 from beeduck/Issue2053Alexander Harkness2015-05-231-0/+7
|\ \ | | | | | | Fix for players falling through world when loading in as spectator
| * | Added a fix for players falling through the world when connecting in spectator modeb33duck2015-05-231-0/+7
| |/
* | Renamed hook HOOK_ENTITY_CHANGE_WORLDLukas Pioch2015-05-211-2/+3
| |
* | Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLDLukas Pioch2015-05-181-0/+10
|/ | | | Fixes #1435.
* More style checking.Mattes D2015-05-091-6/+6
| | | | Spaces around some operators are checked.
* cPlayer now checks restrictions.Mattes D2015-04-251-6/+24
| | | | Fixes #1331.
* Fixed players not appearing/disappearing when traveling to a new world.STRWarrior2015-04-031-0/+6
|
* Merge branch 'master' into InventoryHowaner2015-03-091-50/+55
|\
| * Added OnTeleportEntity hook for plugins.joshi072015-03-051-10/+15
| | | | | | | | | | Plugins may or may not allow teleport to the new position. Updated the HookNotify plugin with it.
| * Changed C-styled casts to static_cast and removed unneeded castsDevToaster2015-02-281-34/+34
| |
| * modified: src/Entities/Player.cppDevToaster2015-02-281-17/+17
| | | | | | | | modified: src/Entities/Player.h
* | Merge branch 'master' into InventoryHowaner2015-02-061-7/+17
|\|
| * Converted cServer to use the cNetwork API.Mattes D2015-01-271-7/+17
| |
* | Merge branch 'master' into InventoryHowaner2015-01-251-1/+97
|\|
| * Initial convertion of a_Dt to std::chronoTycho2015-01-111-1/+1
| | | | | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
| * Replaced a std::hash specialization with explicit type.Mattes D2014-12-241-1/+1
| | | | | | | | std::hash is problematic in gcc / clang, one has a class, the other a struct.
| * Refactored all player block placing to go through hooks.Mattes D2014-12-241-0/+96
| | | | | | | | Fixes #1618.
* | Merge branch 'master' into InventoryHowaner2014-12-171-0/+6
|\|
| * Added braces to 'if' according to the code guidelinesgushromp2014-12-151-0/+2
| |
| * Updated cPlayer::DoMoveToWorld to send target world's weather info to Playerblashyrk2014-12-151-0/+4
| |
* | Own classes for all windows.Howaner2014-12-131-1/+1
|/
* Merged branch 'origin/master' into c++11.Mattes D2014-12-041-6/+11
|\
| * Updated whitespace in comment, changed conditional to logical equivalent due to popular demandJonathan Fabian2014-12-041-2/+2
| |
| * Fix Spaces to TabsJonathan Fabian2014-12-031-5/+5
| |
| * Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world.Jonathan Fabian2014-12-031-6/+11
| |
* | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-0/+3
|\| | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * Renamed GetSettedViewDistance() to GetRequestedViewDistance()Howaner2014-11-151-1/+1
| |
| * Use m_UsedViewDistance and m_SetViewDistance.Howaner2014-11-141-0/+3
| |
* | Compilation fixesTiger Wang2014-11-231-7/+5
| |
* | Merged branch 'master' into c++11.Mattes D2014-10-241-2/+1
|\|
| * Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-241-1/+1
| |\ | | | | | | Merged ini file
| | * Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-231-30/+30
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h
| | * En masse NULL -> nullptr replaceTiger Wang2014-10-231-30/+30
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-7/+7
| |\| | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | Optimized chunk loaderHowaner2014-10-021-1/+0
| | |
* | | En masse NULL -> nullptr replaceTiger Wang2014-10-201-30/+30
| | |
* | | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-201-8/+4
| |/ |/|
* | Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-181-6/+6
|\ \ | | | | | | Improved furnaces
| * | Fixed failure for cRankManager to restartTiger Wang2014-10-181-6/+6
| |/
* / Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-1/+1
|/
* cRankManager: Added GetAllPlayers() and GetPlayerName()Howaner2014-09-281-0/+5
|
* Merge branch 'master' into FixesHowaner2014-09-261-2/+2
|\
| * Merge branch 'master' into redstoneTestsTycho2014-09-251-7/+73
| |\ | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| * \ Merge branch 'master' into redstoneTestsTycho2014-09-171-9/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| * | | Added first test to show the object can be createdTycho2014-09-171-2/+2
| | | |
* | | | Fixed players custom name in 1.8Howaner2014-09-261-3/+4
| |_|/ |/| |
* | | Merge branch 'master' into EntityCustomNameHowaner2014-09-231-19/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h
| * \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-191-5/+24
| |\ \ \
| | * | | Fixed minor style issues.madmaxoft2014-09-171-2/+2
| | | | |
| | * | | Implementing Spectator Modenesco2014-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Adding some proprieties of the spectator game mode in player.cpp : - Players can't toss items - Players can't touch the ground
| | * | | Preparing 1.8 updatenesco2014-09-171-5/+15
| | | | |
| | * | | Preparing 1.8 updatenesco2014-09-161-1/+2
| | | | | | | | | | | | | | | Partially added Spectator gamemode
| | * | | Pre 1.8 releasenesco2014-09-161-0/+8
| | | |/ | | |/| | | | | Added Spectator gamemode
| * | | DerpHowaner2014-09-181-1/+1
| | | |
| * | | Exported player list states to extra functions.Howaner2014-09-181-2/+2
| | | |
| * | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-141-9/+0
| |\| |
| | * | Added extra mushroom handler.Howaner2014-09-121-7/+0
| | | |
| | * | Merge branch 'master' into EffectsHowaner2014-09-121-1/+5
| | |\|
| | * | Merge branch 'master' into EffectsHowaner2014-09-021-0/+23
| | |\ \
| | * | | Fixed potion removing in creative mode.Howaner2014-08-301-4/+2
| | | | |
| * | | | Added the player list to the 1.8 protocol.Howaner2014-09-091-1/+3
| | |_|/ | |/| |
| * | | Fixed player spawning in unknown world.Mattes D2014-09-061-0/+4
| | | | | | | | | | | | | | | | This may happen if the admin removes a world.
| * | | Fixed security: Player cannot spawn in a disabled world.Mattes D2014-09-051-1/+1
| | |/ | |/|
* / | Added SetCustomName() to players.Howaner2014-09-021-1/+46
|/ /
* | Merge remote-tracking branch 'Hircine/Enchantments'madmaxoft2014-09-011-0/+23
|\ \ | |/ |/|
| * Fixed styleJaume Aloy2014-08-311-0/+3
| |
| * Protection Enchantments, some fixesJaume Aloy2014-08-211-1/+1
| | | | | | | | | | | | | | | | - Protection echantments (fire, blast, feather falling, protection and projectile). It isn't finished, add secondary effects and optimize the code. - Removed some brackets. - Silk touch fixed.
| * Added more enchantments and some fixesJaume Aloy2014-08-191-0/+20
| | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect
* | RankMgr: Default rank is applied to players without any rank.Mattes D2014-08-241-1/+5
| |
* | Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-221-4/+13
|\ \
| * | Player: Silenced a few type conversion warnings.Mattes D2014-08-181-2/+2
| | |
| * | Player saving creates the "players" folder, if needed.Mattes D2014-08-171-0/+1
| |/ | | | | | | Fixes #1268.
| * Better OnPlayerMoving hook.Howaner2014-08-161-2/+10
| |
* | Removed cGroup and cGroupManager.Mattes D2014-08-211-2/+0
| |
* | cPlayer reads ranks from cRankManager.Mattes D2014-08-191-201/+55
|/
* Fixed tolua error with static initializationarchshift2014-08-111-0/+9
|
* Player.cpp: change unnamed enum to constant integersarchshift2014-08-111-1/+1
|
* SpacesTycho2014-08-101-1/+1
|
* Fixed potential crash in Player.cppTycho2014-08-101-0/+4
| | | | | Fixes CID 71780 If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player
* Fixed swing arm animation when you ate.Howaner2014-08-101-4/+2
|
* Code reduction and clarity fixesarchshift2014-08-031-10/+7
|
* Removed unused cPlayer::FoodPoison functionarchshift2014-08-031-9/+0
|
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-011-5/+8
|\ | | | | Name to UUID
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-311-44/+50
| |\
| * | Fixed UUIDs handling in cPlayer.madmaxoft2014-07-311-5/+8
| | | | | | | | | | | | The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
* | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.Howaner2014-07-311-17/+36
| |/ |/|
* | Merged branch 'howaner/Options'.madmaxoft2014-07-301-6/+8
|\ \
| * | Add "Broadcasting" settings to world.iniHowaner2014-07-271-6/+8
| |/
* | Slight cleanup after portalsTiger Wang2014-07-291-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-291-2/+2
|\ \ | | | | | | | | | | | | Conflicts: src/World.h
| * | Fix item durability.Howaner2014-07-231-2/+2
| |/ | | | | Fixes #1181
* | SuggestionsTiger Wang2014-07-231-1/+1
| |
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-64/+62
|\| | | | | | | | | | | | | | | 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-54/+54
| |
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-28/+28
| |
| * Removed references to deprecated cChatColor::Colorarchshift2014-07-191-1/+1
| |
| * Code style: Fixed braces on separate lines.madmaxoft2014-07-191-1/+2
| |
| * Fixed clamping issuesarchshift2014-07-191-4/+1
| |
* | SuggestionsTiger Wang2014-07-211-20/+5
| |
* | Bug and crash fixesTiger Wang2014-07-201-18/+17
| | | | | | | | | | | | | | | | | | * 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
* | Fix failed merge and other issuesTiger Wang2014-07-181-32/+8
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-162/+274
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Moved ChatColor.h out of defines where it was not neededarchshift2014-07-181-0/+1
| |
| * Fixed NULL being passed instead of a double to AddEntityEffectarchshift2014-07-171-1/+1
| |
| * Fixed tabs used for alignment.madmaxoft2014-07-171-4/+4
| |
| * More trailing whitespace fixes.madmaxoft2014-07-171-1/+1
| |
| * Player.cpp: Fixed compile errorarchshift2014-07-171-1/+1
| |
| * Player.cpp: Added Wither death messagearchshift2014-07-171-0/+1
| |
| * Basic style fixes.madmaxoft2014-07-171-5/+5
| |
| * Normalized comments.madmaxoft2014-07-171-21/+21
| | | | | | | | | | 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.
| * Merge branch 'master' into potionsmadmaxoft2014-07-171-7/+28
| |\
| | * Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-171-7/+28
| | |\ | | | | | | | | Death messages
| | | * Tailored death messagesTiger Wang2014-07-041-7/+28
| | | |
| * | | Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-171-2/+11
| |\| |
| | * | Another fix for excessive food drainTiger Wang2014-07-161-0/+9
| | | |
| | * | Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-2/+2
| | |\ \ | | | | | | | | | | Skins
| | | * | Player properties are now retrievedTiger Wang2014-07-141-2/+2
| | | | |
| * | | | Merge branch 'master' into potionsmadmaxoft2014-07-151-1/+1
| |\| | |
| | * | | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-1/+1
| | |/ /
| * | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-121-72/+142
| |\| |
| | * | Simplified the player data loading.madmaxoft2014-07-111-9/+8
| | | |
| | * | Player data filenames are based on UUID.madmaxoft2014-07-111-54/+111
| | | |
| | * | Fixed a missing return value.madmaxoft2014-07-111-0/+2
| | | |
| | * | Preparation for player UUID-based storage: LoadFromFile()madmaxoft2014-07-111-21/+33
| | |/
| * | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-42/+60
| |\| | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| | * Merge pull request #1138 from mc-server/enderchestMattes D2014-07-021-13/+20
| | |\ | | | | | | | | Properly implemented enderchests
| | | * SuggestionTiger Wang2014-07-021-13/+13
| | | |
| | | * Properly implemented enderchestsTiger Wang2014-06-291-0/+7
| | | |
| | * | Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-021-27/+25
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp
| | | * | Fixes.Howaner2014-06-301-3/+3
| | | | |
| | | * | Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGEHowaner2014-06-301-26/+24
| | | | |
| | * | | Fixed player teleport food drainTiger Wang2014-07-021-1/+9
| | |/ /
| | * / Fixed respawningTiger Wang2014-06-291-1/+1
| | |/ | | | | | | | | | * Fixes #1103
| | * Likely fixed too quick food depletionTiger Wang2014-06-281-1/+1
| | | | | | | | | | | | * Fixes FS427 properly, hopefully
| | * Merge branch 'master' into BowHowaner2014-06-261-0/+1
| | |\
| | * | Add bow charging animationHowaner2014-06-161-1/+5
| | | |
| * | | EntityEffects.x -> EntityEffect.x, Object-Oriented effectsarchshift2014-06-191-37/+0
| | | | | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result.
| * | | Entity Effects: Clarified user, added it to AddEntityEffectarchshift2014-06-171-1/+1
| | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class.
| * | | Changed the AddEntityEffect() params for easier calls.madmaxoft2014-06-171-1/+1
| | | |
| * | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-171-2/+2
| | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua
| * | | Entity effect type: use 'eff' as a prefix instead of 'ef'archshift2014-06-171-6/+6
| | | |
| * | | Implemented milk, added documentation to Pawn.harchshift2014-06-171-1/+1
| | | |
| * | | Pawn.cpp: fixed effect iterator BAD_ACCESSarchshift2014-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Erasure was occurring before the iterator increased, causing a bad access. Solved by storing map pairs in variables and manually updating iterator before erasure. Fixed mix-up in function arguments on food poisoning
| * | | EntityEffect: read-only getters, added user and distance modifier fieldsarchshift2014-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | User: the pawn that uses or produces the entity effect (drinks/throws a potion) Distance modifier: the potency modifier from splash potion effectivity radius
| * | | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-171-20/+1
| | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior
| * | | Entity effects: Added handlers for entity effectsarchshift2014-06-171-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations
| * | | Moved Effects.h to EntityEffects.h, added initial implarchshift2014-06-171-3/+3
| |/ /
* | | Merge branch 'master' into portalsTiger Wang2014-06-211-1/+30
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * | Nullify deleted pointers.archshift2014-06-191-0/+1
| |/
| * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-1/+29
| |
* | Fixed invalid iteratorsTiger Wang2014-06-211-0/+1
| |
* | More suggestionsTiger Wang2014-06-211-1/+1
| |
* | Implemented PR suggestionsarchshift2014-06-161-1/+1
| | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef
* | Portals animate and delay correctlyTiger Wang2014-06-121-15/+6
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-10/+10
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-8/+10
| | | | | | | | Fixes #1039, fixes #851
| * Added queue for adding entities to cWorld.Mattes D2014-06-081-2/+0
| | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | Fixed compilationTiger Wang2014-06-051-1/+1
| |
* | SuggestionsTiger Wang2014-06-041-0/+1
| |
* | Configurable portalsTiger Wang2014-06-041-1/+1
| |
* | SuggestionsTiger Wang2014-06-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-7/+0
|\|
| * Player permissions aren't logged to console anymore.madmaxoft2014-06-031-7/+0
| | | | | | | | This was only logspam on most servers and there are alternative ways to list players' permissions.
* | Implemented bed homesTiger Wang2014-06-011-13/+22
| | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change
* | Implemented end and nether portalsTiger Wang2014-05-311-10/+26
|/
* Merge branch 'master' into achievementtranslateTiger Wang2014-05-251-14/+57
|\ | | | | | | | | Conflicts: src/Entities/Player.cpp
| * Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-201-14/+57
| |
* | Update Player.cppAlexander Harkness2014-05-201-19/+19
| |
* | Added client translation to achievementsTiger Wang2014-05-191-4/+4
|/
* There's no "round" function in MSVC2008.madmaxoft2014-05-181-3/+3
|
* Fixesandrew2014-05-131-10/+11
|
* Movement Statisticsandrew2014-05-121-9/+77
|
* cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-4/+66
|
* Fixed stat serializationandrew2014-05-111-10/+21
|
* Statistic Managerandrew2014-05-111-2/+19
|
* Suggestions'd #2Tiger Wang2014-05-061-1/+1
|
* Suggestions'dTiger Wang2014-05-061-1/+1
|
* Merge branch 'master' into fixes.madmaxoft2014-05-021-9/+12
|\
| * Add entity invulnerableHowaner2014-04-261-9/+12
| |
* | A tiny speed improvement in ApplyFoodExhaustion()Tiger Wang2014-04-271-5/+5
| |
* | Merge branch 'master' into fixesTiger Wang2014-04-241-5/+6
|\| | | | | | | | | Conflicts: src/World.h
| * Fixed Flint and Steel, reverted Minecart change, renamed a parameter namejfhumann2014-04-191-2/+2
| |
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-19/+15
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-4/+5
| | |
* | | Some change to Entity.cppTiger Wang2014-04-231-16/+6
| |/ |/| | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer
* | Merge pull request #891 from mc-server/fixesMattes D2014-04-171-1/+1
|\ \ | | | | | | Fixes to redstone & general
| * | Entities handle chunks properly againTiger Wang2014-04-121-1/+1
| |/ | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty
* / Added new AI rulesTiger Wang2014-04-171-18/+14
|/ | | | | | | + Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
* Added cPlayer:SendRotation() API function.madmaxoft2014-04-051-0/+11
|
* Fixed #721 and FS439Tiger Wang2014-03-291-0/+1
|
* Plugins can set flying speed.madmaxoft2014-03-201-3/+30
|
* Rewritten player speeds to be relative unit-less.madmaxoft2014-03-201-2/+2
| | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
* Unified Vector classesandrew2014-03-111-0/+1
|
* Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-29/+17
|\ | | | | | | | | Conflicts: src/ClientHandle.cpp
| * g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-1/+1
| |
| * Shortened enumsandrew2014-03-011-2/+2
| |
| * Exported and documented cScoreboardandrew2014-03-011-18/+3
| |
| * Moved common cGroupManager code to a separate function.madmaxoft2014-02-281-7/+11
| | | | | | | | This fixes my concerns in PR #709.
| * Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-281-7/+6
| |\ | | | | | | Add 'Group not found', when the Server load the users.ini and add auto g...
| | * Remove users.ini generation in Player.cpp and use the CheckUsers() FunctionHowaner2014-02-211-6/+1
| | |
| | * Add 'Group not found', when the Server load the users.ini and add auto generate from users.iniHowaner2014-02-211-1/+5
| | |
* | | CheckBlockInteractionsRate() fixed & enabledTiger Wang2014-03-091-25/+0
| | |
* | | Removed unneeded includes in Player.cppTiger Wang2014-02-271-7/+0
|/ /
* | Manual merge (Fixed conflicts)andrew2014-02-201-2/+15
|\|
| * Fixed minor formatting issues from #682Tiger Wang2014-02-161-10/+1
| | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code
| * Add Exp Bottle EffectsHowaner2014-02-161-0/+9
| |
| * Disable Hunger DeathHowaner2014-02-161-1/+7
| |
| * Merge pull request #679 from mc-server/NotchDeathAlexander Harkness2014-02-151-0/+6
| |\ | | | | | | NotchApple
| | * If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/NotchSTRWarrior2014-02-151-0/+6
| | |
| * | Made player jump reset less ambiguousTiger Wang2014-02-121-1/+2
| | |
| * | Fixed #627Tiger Wang2014-02-111-2/+2
| |/ | | | | | | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P)
* / Map item handler; Fixed several bugsandrew2014-02-171-0/+3
|/
* Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-13/+0
|\ | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * Removed deprecated HasCommand functionSTRWarrior2014-02-051-13/+0
| |
* | Improved chat messaging functionsTiger Wang2014-02-071-10/+0
| | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | Server internally uses new functionsTiger Wang2014-02-061-6/+4
| |
* | Fixed annoying creative on fire bugTiger Wang2014-02-051-0/+17
| |
* | Fixed a crash bugTiger Wang2014-02-031-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-031-2/+2
|\|
| * Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-031-2/+2
| |\ | | | | | | Redstone crash fix and current console line replace function
| | * Creative players take Plugin damageTiger Wang2014-02-021-2/+2
| | |
* | | Server now handles join messages alsoTiger Wang2014-02-031-1/+7
|/ / | | | | | | * Revised as well hook documentation
* | Merge pull request #585 from daniel0916/hooksMattes D2014-02-011-0/+2
|\ \ | |/ |/| Added "player destroying" and "player destroyed" hooks
| * Removed "player destroying" hookdaniel09162014-02-011-3/+1
| |
| * Added "player destroying" and "player destroyed" hooksdaniel09162014-01-251-0/+4
| | | | | | | | | | | | | | | | Hooks: HOOK_PLAYER_DESTROYING HOOK_PLAYER_DESTROYED Idea from: https://github.com/mc-server/MCServer/issues/473
* | Two minor changesTiger Wang2014-01-251-5/+3
| |
* | Implemented fall damage for mobsTiger Wang2014-01-251-4/+2
| | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros
* | All mobs now drown (fixes #54)Tiger Wang2014-01-251-103/+14
| | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded
* | Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-241-42/+51
|\ \
| * | Fixed indentation once and for all.Mike Hunsinger2014-01-241-31/+31
| | |
| * | Fixed indentation and doxygen comments... For real this time.Mike Hunsinger2014-01-241-3/+3
| | |
| * | Fixed spacing and doxycomments.Mike Hunsinger2014-01-241-3/+3
| | |
| * | Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-231-49/+58
| |/
* | Fixed compilation on VC2008tonibm192014-01-221-0/+1
| |
* | Scoreboard protocol supportandrew2014-01-211-6/+11
| |
* | Scoreboard deserializationandrew2014-01-201-1/+21
| |
* | Scoreboard improvementsandrew2014-01-191-4/+4
| |
* | Basic scoreboard implementationandrew2014-01-191-0/+52
|/
* Removed internal cEntity::GetRot() usage.madmaxoft2014-01-171-2/+2
|
* Removed obsoleted functionsTiger Wang2014-01-161-3/+3
|
* Implemented Ctrl-Q drop stackTiger Wang2014-01-151-3/+8
| | | | Also fixed an issue with TossItems not respecting count.
* Yes newline at end of file :DTiger Wang2014-01-141-1/+5
|
* Detaching improvementsTiger Wang2014-01-131-0/+26
| | | | | * Players now search for an area around themselves to teleport to when detaching from something
* Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.Morgan Redshaw2013-12-311-2/+2
|
* Server now handles death messagesTiger Wang2013-12-261-0/+16
|
* Merge pull request #461 from mc-server/repeatersMattes D2013-12-261-3/+20
|\ | | | | Repeaters, pressure plates, and others
| * Braced up some codeTiger Wang2013-12-251-0/+2
| |
| * Used IsGamemodeCreative() functionTiger Wang2013-12-251-1/+1
| |
| * Fixed comments in main.cpp and Player.cppTiger Wang2013-12-241-1/+1
| |
| * Improved player fall particle positionsTiger Wang2013-12-231-5/+2
| |
| * Clarified some code in Player.cppTiger Wang2013-12-231-2/+5
| |
| * Implemented fall particlesTiger Wang2013-12-221-3/+18
| |
* | finally removed them all?Alexander Harkness2013-12-241-1/+1
| |
* | Floater now dissapears when the player doesn't have an fishing rod equipped.STRWarrior2013-12-211-0/+29
|/
* Sorted a few constructors to remove warnings.madmaxoft2013-12-201-21/+22
|
* Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-191-0/+18
|\ | | | | Multiple fixes
| * Fixed PlayerAbilities and creativeTiger Wang2013-12-191-0/+18
| |
* | Implented IsFishing, SetIsFishing and GetFloaterID().STRWarrior2013-12-191-0/+2
|/
* Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-161-22/+0
| | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187.
* Server saves if a player is flying.STRWarrior2013-12-151-1/+3
|
* Renamed ShootTo function to ForceSetSpeed.STRWarrior2013-12-151-1/+1
|
* This adds a function that allows you to 'shoot' a player towards a direction.STRWarrior2013-12-151-0/+10
|
* Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-151-0/+32
|
* cPlayer is using the broadcast functions.STRWarrior2013-12-151-3/+3
|
* Added E_EFFECT_<Effect>STRWarrior2013-12-141-3/+3
|
* Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-141-1/+9
|
* Improved player permissions loggingTiger Wang2013-12-141-1/+1
|
* Fixes to redstone wire and torchesTiger Wang2013-12-141-1/+1
| | | | | | + Wires now power blocks around the block beneath * Torches no longer power off if it is on a linked powered block * Enhanced code, split functions, etc.
* Groups.ini and Users.ini are now generatedTiger Wang2013-12-141-1/+6
|
* 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
* | Renamed animation functionTiger Wang2013-12-071-3/+3
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Puking now uses GetEyeHeight()Tiger Wang2013-12-061-1/+1
| |
* | Fixed eating using wrong animationTiger Wang2013-12-061-1/+1
| |
* | Tools make a sound when breaking, fixes #266Tiger Wang2013-12-061-1/+4
|/
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-271-1/+1
|
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-2/+2
|
* Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-2/+2
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-28/+78
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+1715