summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D2020-04-031-0/+1
| | | | | | | | | The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
* Replace buckets to the selected hotbar slot, rather than the first available. (#4580)Alexander Harkness2020-04-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* Send experience on respawn (#4586)Mat2020-03-301-0/+1
|
* Fix client disconnect assert (#4579)peterbell102020-03-291-3/+3
|
* cClientHandle: Only allow m_State to increase (#4533)peterbell102020-03-281-40/+45
| | | | | | | * cClientHandle: Only allow m_State to increase * WasAddedToWorld was incorrect if kicked * Rewrite cClient::Destroy with a guard clause
* When Client sends message longer than 256 bytes, kick him instead of handling message (#4514)Max Luchterhand2020-03-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Wrong overload of function push() got called when pushing a cEntity*. Using a const cEntity * fixes this. * Fixed accidental wrong indentation * Compiler didn't like old style cast * Kicking player when writing chat message longer than 2048 * Accounted for Astrings size() method returning bits, not bytes * Fixed typo * Changed MAX_STRING_SIZE to 1024, removed unnecessary division by 8 * Handling message length check in cClientHandle:HandleChat * Guard clause instead of if else * Remove stale changes * Fixed formatting Co-authored-by: mluchterhand <mluchterhand@max.de> Co-authored-by: Peter Bell <peterbell10@live.co.uk> Co-authored-by: Mattes D <github@xoft.cz>
* Manual merge of #4498.Alexander Harkness2020-03-231-1/+1
| | | | | | Credit to @MeMuXin Closes #4498
* Don't call player movement hook if nothing changed (#4517)Mat2020-03-211-0/+20
| | | Co-authored-by: peterbell10 <peterbell10@live.co.uk>
* Stabilise MoveToWorld (#4004)Mat2020-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Blocks are usable in adventure mode (#4464)Mat2020-01-151-1/+1
|
* Disable block placement in adventure mode (#4424)Mat2019-12-301-2/+2
|
* Refactored block-to-pickup conversion. (#4417)Mattes D2019-10-161-9/+15
|
* Added another check if the item is place able (#4404)Lukas Pioch2019-10-031-0/+7
|
* Add a formatting function for Vector3 (#4282)peterbell102018-09-241-9/+9
| | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG
* Store and pass entity effect duration as an int not a short. (#4293)Alexander Harkness2018-08-261-1/+1
| | | Fixes #4292.
* cWorld: Manually bind deprecated broadcast functions (#4265)peterbell102018-07-271-1/+1
| | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-261-1/+3
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* Keep players in gmNotSet (#4248)changyong guo2018-07-231-8/+13
| | | | 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/+12
| | | | | | | 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/+2
| | | | | Fixes #4177 This is a breaking change to existing Cuberite permissions settings.
* Support swap item between main hand and offhand by press key "F" (#4241)changyong guo2018-06-241-1/+8
| | | | | | | | Hi, I found cuberite don't support to press key "F" to swap items on main hand and offhand, so I implemented this feature. Best regards Changyong
* Prefer static_cast to reinterpret_cast (#4223)peterbell102018-05-021-3/+3
| | | | | | | * 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.
* Removed unnecessary disconnect (#4200)mathiascode2018-04-271-5/+0
|
* Properly destroy player (#4199)mathiascode2018-04-031-7/+7
|
* Broadcast playerlist removal in every world (#4201)mathiascode2018-04-021-5/+3
|
* cClientHandle: Always call HOOK_PLAYER_RIGHT_CLICK (#4149)peterbell102018-01-251-6/+11
| | | Reverts the reduction in cases where the hook was called, a change which broke plugins.
* Rewrite cClientHandle::HandleRightClick (#4089)9caihezi2018-01-081-148/+130
| | | | | | | | | | | | | * Add hand parameter to distinguish main hand/off hand. * Add a new function cClientHandle::HandleUseItem to separate the functionality of using an item without a target block. This matches the protocol with client version >= 1.9 * Always actively update the status of a block if the placement fails (by out of reach or rejected by plugin). * Do not call plugin callback CallHookPlayerRightClick(-1, 255, -1, -1, 0, 0, 0) when using item. The CallHookPlayerUsingItem will still be called. Now at most one of CallHookPlayerRightClick, CallHookPlayerUsingBlock, CallHookPlayerUsingItem and CallHookPlayerEating will be called based on the type of action (not including the used version of callbacks). * Do not count using item as BlockInteractionsRate check (Using item takes time). * Now we can open chests(etc.) when sneaking as long as the player's hand is empty. This is what vanilla server does.
* Add the fmt library (#4065)peterbell102018-01-031-1/+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-1/+1
|
* Implement horse inventory (#4053)peterbell102017-10-211-0/+12
| | | | | | | | | | * Implement horse inventory * Fix sign conversions * Add API doc for ItemCategory::IsHorseArmor * Improve HandleOpenHorseInventory comment and style fixes.
* BroadcastBlockBreakAnimation and BroadcastBlockEntity use vectors (#4038)Bond-0092017-09-251-3/+3
|
* Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959)Lane Kolbly2017-09-191-1/+11
| | | | | | | | | | | | | | | | | | * 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-191-1/+1
|
* Replace ItemCallbacks with lambdas (#3993)peterbell102017-09-111-51/+22
|
* Shutdown connection when disconnect packet sent (#3999)Alexander Harkness2017-09-081-4/+10
|
* Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-021-22/+51
| | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* OnLogin now kicks players properly (#3980)Alexander Harkness2017-09-011-1/+2
|
* Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-011-51/+22
|
* Update mbedtls to 2.5.1 (#3964)peterbell102017-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | * Renaming changes: * macro prefix "POLARSSL" -> "MBEDTLS" * functions now prefixed with "mbedtls_" * rename PolarSSL++ -> mbedTLS++ * rename polarssl submodule * Use mbedtls' AES-CFB8 implementation. * Add cSslConfig to wrap mbedtls_ssl_config * Update cTCPLink and cBlockingSslClientSocket to use cSslConfig * Use cSslConfig in cHTTPServer * Use cSslConfig for cMojangAPI::SecureRequest * CI Fixes * Set -fomit-frame-pointer on the right target
* Implement Forge protocol handshake support (#3869)satoshinm2017-08-271-1/+24
|
* Add cUUID class (#3871)peterbell102017-08-251-34/+7
|
* Fully implemented leashes (#3798)Pablo Beltrán2017-08-211-0/+18
|
* Merge pull request #3921 from lkolbly/removeAssertTiger Wang2017-08-181-3/+0
|\ | | | | - Removed incorrect assert in SendRespawn
| * Removed incorrect assert in cClientHandle::SendRespawn.Lane Kolbly2017-08-111-3/+0
| |
* | Changed entity ownership model to use smart pointersTiger Wang2017-08-071-4/+25
|/
* Removed double includes (#3885)Lukas Pioch2017-08-021-1/+0
|
* cBlockHandler: take player by refpeterbell102017-08-011-4/+4
|
* cWorld::SendBlockTo take player by refpeterbell102017-08-011-14/+14
|
* Tentative fix for player-limit race condition (#3862)Tiger Wang2017-07-281-8/+14
| | | | | | | | | | * Attempts to fix #2257 Derived from d233e9843148313c71fbaba96ccff660e47b07b1 * Changed player count type to int * Clarified certain actions
* Fixed memory leak in cClientHandle. (#3794)Mattes D2017-06-261-5/+5
|
* Fix assert when clicking blocks at the top of the world.Mattes D2017-06-091-12/+16
|
* Add rank prefix and suffix to player name in chat (#3730)Heiko Hund2017-05-271-1/+5
| | | Fixes issue #1721
* Off-hand/shield slot functional, save and load slot, bow + arrow functional (#3725)Pablo Beltrán2017-05-241-0/+10
| | | Fixes #3714.
* Allow enabling/disabling of block change limitmathiascode2017-05-191-1/+1
|
* Fixed ClientHandle:GetProtocolVersion returning wrong number.Mattes D2017-01-281-8/+2
|
* Initial support for the 1.11 protocol.Mattes D2016-12-161-2/+2
|
* Fixed race conditions in cClientHandle's State.Mattes D2016-11-191-157/+208
|
* Anticheat fastbreak (#3411)mohe20152016-11-061-0/+27
| | | Added block hardness checks when breaking blocks.
* Added SendMessageRaw for sending json string.Lukas Pioch2016-10-211-0/+9
|
* Spectators added (#2852)bibo382016-10-121-2/+54
|
* Use cChunkDef::Height for Y coord comparison where applicable.Moritz Borcherding2016-09-271-2/+2
|
* Fixed cCompositeChat's constructor LuaAPI bindings.Mattes D2016-09-251-5/+3
| | | | The tolua-generated constructor would return an extra string value.
* Improve cPlayer::DoMoveToWorld (#3113)LogicParrot2016-09-031-1/+0
|
* Proper respawn packets on dimension travelLogicParrot2016-08-291-1/+17
|
* Fixed SendUnloadChunk bug (#3353)LogicParrot2016-08-281-1/+1
|
* Fix breaking ice in survival not giving a water's source (#3356)ElNounch2016-08-281-1/+1
| | | Fix #3355
* Fixed RasPi builds of unit tests.Mattes D2016-08-041-1/+3
| | | | | On RasPi with gcc 4.8.2, the asserts wouldn't compile when tests were enabled. Enforced the assumption that ASSERT code is generated only in Debug builds.
* Tab completion across worlds (#3270)Alexander Harkness2016-07-211-1/+13
| | | Fixes #2563.
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-141-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Semistable update to 15w31a I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written. * Update to 15w34b protocol Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff! * Partially update to 15w35e Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d. * Add '/blk' debug command This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible. * Fix CRLF normalization in CheckBasicStyle.lua Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't. The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored. * Update to 15w40b This includes chunk serialization. Fully functional chunk serialization for 1.9. I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code. * Write long-by-long rather than creating a buffer This is a bit faster and should be equivalent. However, the code still doesn't look too good. * Update to 15w41a protocol This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added. * Update to 15w45a * 15w51b protocol * Update to 1.9.0 protocol Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks). * Fix item pickup packet not working That was a silly mistake, but at least it was an easy one. * 1.9.2 protocol support * Fix version info found in server list ping Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately. * Fix build errors generated by clang These didn't happen in MSVC. * Add protocol19x.cpp and protocol19x.h to CMakeLists * Ignore warnings in protocol19x that are ignored in protocol18x * Document BLOCK_FACE and DIG_STATUS constants * Fix BLOCK_FACE links and add separate section for DIG_STATUS * Fix bat animation and object spawning The causes of both of these are explained in #3135, but the gist is that both were typos. * Implement Use Item packet This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block. * Handle DIG_STATUS_SWAP_ITEM_IN_HAND * Add support for spawn eggs and potions The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending. * Remove spammy potion debug logging * Fix wolf collar color metadata The wrong type was being used, causing several clientside issues (including the screen going black). * Fix 1.9 chunk sending in the nether The nether and the end don't send skylight. * Fix clang build errors * Fix water bottles becoming mundane potions This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion. Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging. * Copy Protocol18x as Protocol19x Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names). * Make thrown potions use the correct appearence This was caused by potions now using metadata. * Add missing api doc for cSplashPotionEntity::GetItem * Fix compile error in SplashPotionEntity.cpp * Fix fix of cSplashPotionEntity API doc * Temporarilly disable fall damage particles These were causing issues in 1.9 due to the changed effect ID. * Properly send a kick packet when connecting with an invalid version This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping. I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way). * Handle server list pings from unrecognized versions This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse). * Use cPacketizer for the disconnect packet This also should fix clang build errors. * Add 1.9.3 / 1.9.4 support * Fix incorrect indentation in APIDesc
* Fixed some logout crashesLogicParrot2016-04-241-2/+3
|
* ClientHandle destruction thread safetyLogicParrot2016-04-231-2/+13
|
* Auto clean bad world linkagesLogicParrot2016-04-191-0/+1
|
* Minor improvements to player freezeLogicParrot2016-04-051-4/+4
|
* Improved player freeze codeLogicParrot2016-04-051-16/+19
|
* Players never fall through unloaded chunks or end up inside solids on teleportLogicParrot2016-03-311-1/+46
|
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-19/+12
|
* Don't remove water after ice block has been destroyedLukas Pioch2016-02-181-1/+5
|
* Prevent player from falling when block breaking is deniedLogicParrot2016-02-081-0/+2
|
* Updated old forum linksMathias2016-01-311-1/+1
|
* Improved tamed wolf pack cooperation and projectile reactionsLogicParrot2016-01-221-1/+1
|
* Fix crash when tamed wolf is hit by arrowsLogicParrot2016-01-161-1/+4
|
* Limited the username length to 16 characters.bibo382016-01-131-0/+6
| | | | | | 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-67/+69
|
* Reorganised the redstone simulatorTiger Wang2015-12-181-0/+6
| | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved
* allow use failures to propagate from the entity/block to the playerGargaj2015-12-131-7/+8
|
* Add enum for Sound and Particle EffectsDave Tucker2015-11-241-2/+3
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* Examined a fix for #2588Tiger Wang2015-11-021-0/+6
|
* Fixed a crash when sending messages too early after connection.Mattes D2015-10-211-1/+12
|
* Improved the data structure for storing loaded chunkstycho2015-10-051-7/+7
| | | | Should significantly increase the performance of deciding which chunks to stream
* Maked it compileable for clang-3.7Lukas Pioch2015-09-251-5/+5
|
* Refactored cProtocol Chat handlingtycho2015-09-211-8/+10
|
* Fixed food drain bugsTiger Wang2015-08-201-24/+14
|
* Fix old style casts and implicit conversionsMatti Hänninen2015-08-121-1/+1
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-291-23/+23
|
* Improved mapsTiger Wang2015-07-141-20/+2
|
* Fixed warnings generated by 64-bit MSVC.Mattes D2015-07-071-2/+2
|
* Reinstate "Chunk queue collapsing"Tiger Wang2015-06-101-15/+12
| | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
* Revert "Chunk queue collapsing"worktycho2015-06-071-12/+15
|
* Made the list of chunks to stream an unordered_settycho2015-06-051-15/+12
| | | | This should increase performance of chunk streaming
* Added system and above action bar chat messagesjan642015-06-021-0/+58
|
* Fix Destroy() calling behaviourTiger Wang2015-05-301-1/+2
| | | | * Fixes Core/#142
* Fix for the way connecting clients receive player lists and broadcast chatb33duck2015-05-291-3/+3
|
* Potential crash fixesTiger Wang2015-05-281-6/+3
| | | | | * Potentially addresses my comment in #1969 * Probably fixes #2145
* Fixed ClientHandle not getting properly removed from the worldtycho2015-05-261-2/+9
| | | | | when socket is closed whilst the client is being added to the world Fixes #1969
* Merge pull request #1848 from scottwillmoore/ImplementTitleCommandMattes D2015-05-261-0/+63
|\ | | | | Implement backend for /title command
| * Implement backend for /title commandScott Moore2015-04-131-0/+63
| |
* | Fixed chat message manipulation by plugins.Mattes D2015-05-131-1/+1
| | | | | | | | Plugins, in their OnChat hook, can change the chat message sent by a player.
* | More style checking.Mattes D2015-05-091-6/+6
| | | | | | | | Spaces around some operators are checked.
* | Added support for additional data in the ParticleEffect Packettycho2015-05-071-0/+9
| | | | | | | | Also started refactoring how broadcasts are handled
* | ClientHandle: Fixed re-sending refused right-clicks.Mattes D2015-04-191-1/+8
| | | | | | | | | | The coords weren't checked against Y boundary and -1 coords weren't sent. This fixes mc-server/Gallery#45.
* | Placing a fluid from bucket calls plugin hooks.Mattes D2015-04-141-1/+3
|/ | | | Ref.: #1857.
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-241-14/+14
|\ | | | | Unify packetizer
| * Fixed signedness warnings in Protocol.Mattes D2015-03-211-1/+1
| |
| * Fixed signedness issues in protocols.Mattes D2015-03-211-1/+1
| |
| * Unified cByteBuffer types.Mattes D2015-03-211-12/+12
| | | | | | | | cByteBuffer now reads and writes any of the [U]Int<N> types.
* | Correct world height validations.Tommy Santerre2015-03-201-0/+6
|/ | | | | 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
* Merge pull request #1734 from mc-server/pistonsMattes D2015-03-141-25/+4
|\ | | | | Handle client 'leave bed' request
| * Reverted non-functional changesTiger Wang2015-03-051-1/+2
| |
| * Handle client 'leave bed' requestTiger Wang2015-02-081-25/+3
| | | | | | | | * Fixes #1728
* | Merge branch 'master' into InventoryHowaner2015-03-091-2/+6
|\ \
| * | Fixed race condition for TCP link deleting.Mattes D2015-02-221-2/+6
| |/ | | | | | | This could have caused crashes when a client disconnected from the server.
* | Merge branch 'master' into InventoryHowaner2015-02-061-111/+134
|\|
| * Fixed a deadlock in cClientHandle network sending.Mattes D2015-01-271-4/+23
| |
| * Client: Only decode protocol when there's actual data incoming.Mattes D2015-01-271-2/+8
| |
| * Fixed enchant packet handling.Mattes D2015-01-271-3/+3
| |
| * Converted cServer to use the cNetwork API.Mattes D2015-01-271-108/+106
| |
* | Merge branch 'master' into InventoryHowaner2015-01-251-150/+12
|\|
| * Fixed warnings in 1.7 protocol.Mattes D2015-01-181-2/+2
| |
| * Refactored all player block placing to go through hooks.Mattes D2014-12-241-148/+10
| | | | | | | | Fixes #1618.
* | Own classes for all windows.Howaner2014-12-131-0/+3
|/
* Cosmetic touchups.Mattes D2014-12-111-1/+1
| | | | Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
* Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-101-1/+39
|\ | | | | Prevent multiple logins with same username, unless allowed in settings
| * Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin()Vincent2014-12-101-1/+1
| | | | | | | | Compiles correctly.
| * Fixed return value in CheckMultiLogin()Vincent2014-12-091-1/+2
| |
| * Fixed indent problems and added return definitions to CheckMultiLogin().Vincent2014-12-091-3/+3
| | | | | | | | | | Changed from IsAllowMultiLogin() to DoesAllowMultiLogin(). Fixed CheckMultiLogin() to not run to the end without returning a value.
| * Changed CheckMultiLogin() to not have main body wrapped in an if statement.Vincent2014-12-081-19/+22
| | | | | | | | | | | | Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin(). Added doxy-comment for DoWithPlayer(). Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments.
| * created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World.Vincent2014-12-081-1/+1
| |
| * Fixed compile errorsVincent2014-12-081-8/+3
| |
| * removed last space in handlehandshakeVincent2014-12-081-1/+0
| |
| * Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player.Vincent2014-12-081-24/+23
| |
| * Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added.Vincent2014-12-081-22/+38
| |
| * Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253Vincent2014-12-071-5/+5
| |\
| | * Changed Kick messagevincentleung12014-11-301-2/+2
| | |
| | * removed extra space and fixed some formatting in cCallbackvincentleung12014-11-301-3/+3
| | |
| * | changed from using iterator to auto for server and clienthandleVincent2014-12-071-2/+2
| |/
| * Uses callback for players already in World.Vincent2014-11-301-5/+12
| |
| * fixed naming of strings and changed from i to IVincent2014-11-291-4/+4
| |
| * issue 1253 - prevent multiple logins with same usernameVincent2014-11-291-0/+18
| |
* | Fixed c++11 branch issues.Mattes D2014-12-071-4/+8
| |
* | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-061-0/+4
|\ \ | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp
| * | BasicStyle: Added missing braces to control statements.Mattes D2014-12-051-0/+4
| |/
* | Merged branch 'origin/master' into c++11.Mattes D2014-12-041-4/+10
|\|
| * ClientHandle: Fixed max block place distance check.Mattes D2014-11-251-4/+10
| | | | | | | | Fixes #1492
* | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-11/+25
|\| | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-181-2/+8
| |\ | | | | | | Fixed a security problem with signs.
| | * Use LastPlacedSign instead of LastPlacedBlock.Howaner2014-11-151-3/+4
| | |
| | * Fixed a security problem with signs.Howaner2014-11-151-2/+7
| | |
| * | Fixed a wrong assert in cClientHandle::SetViewDistance().Mattes D2014-11-171-4/+8
| | |
| * | Renamed m_UsedViewDistance to m_CurrentViewDistanceHowaner2014-11-151-8/+8
| | |
| * | Renamed m_SetViewDistance to m_RequestedViewDistanceHowaner2014-11-151-4/+4
| | |
| * | Use m_UsedViewDistance and m_SetViewDistance.Howaner2014-11-141-8/+10
| | |
| * | Merge branch 'master' into ViewDistanceHowaner2014-11-141-1/+1
| |\|
| | * Fixed m_SentChunks list chunk removing.Howaner2014-10-301-1/+1
| | |
| * | Added a MaxViewDistance option.Howaner2014-10-301-1/+3
| |/
* | Merged branch 'master' into c++11.Mattes D2014-10-241-78/+150
|\|
| * Use 3 priorities.Howaner2014-10-231-1/+1
| |
| * Merge branch 'master' into ChunkLoaderHowaner2014-10-231-25/+25
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h
| | * En masse NULL -> nullptr replaceTiger Wang2014-10-231-26/+26
| | |
| * | Use two lists and 2 chunk send prioritys.Howaner2014-10-211-41/+0
| | |
| * | New c++11 stuff.Howaner2014-10-211-4/+4
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-7/+41
| |\| | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | Added distance check.Howaner2014-10-071-0/+12
| | |
| * | Stream 4 chunks per tick. Added priority.Howaner2014-10-061-13/+22
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-061-2/+10
| |\ \
| * | | Better StreamNextChunk() methodHowaner2014-10-061-15/+116
| | | |
| * | | Optimized chunk loaderHowaner2014-10-021-86/+77
| | | |
* | | | En masse NULL -> nullptr replaceTiger Wang2014-10-201-26/+26
| | | |
* | | | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-201-13/+5
| | | |
* | | | Migrated random generators to std::randomTiger Wang2014-10-191-12/+0
| |_|/ |/| |
* | | Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-181-1/+1
|\ \ \ | | | | | | | | Improved furnaces
| * | | Improved furnacesTiger Wang2014-10-031-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070
* | | Merged branch 'fix_chunks'.Mattes D2014-10-161-3/+34
| | |
* | | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-2/+2
| | |
* | | Usernames are lowercased before generating offline UUID.Mattes D2014-10-151-1/+4
| |/ |/| | | | | This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization.
* | cClientHandle: Added protocol version knowledge.Mattes D2014-10-051-2/+10
|/
* Rewritten plugin messages, vanilla are being parsed directly.madmaxoft2014-09-301-90/+30
| | | | This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
* Fixed trailing whitespace.madmaxoft2014-09-281-1/+1
|
* Merge pull request #1466 from mc-server/endofsupportMattes D2014-09-281-14/+0
|\ | | | | Removed protocols 1.2 to 1.6
| * Dropped support for <1.7.xTiger Wang2014-09-271-14/+0
| |
* | Combined conditionsMasy982014-09-271-8/+11
| |
* | Added barriers correctlyMasy982014-09-271-0/+5
|/
* Fixed players custom name in 1.8Howaner2014-09-261-2/+2
|
* Merge branch 'master' into EntityCustomNameHowaner2014-09-231-64/+164
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+10
| |\
| | * BungeeCord compatibility: don't overwrite UUID / properties.madmaxoft2014-09-171-2/+10
| | |
| * | Exported player list states to extra functions.Howaner2014-09-181-6/+42
| | |
| * | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-141-1/+1
| |\|
| | * Merge pull request #1353 from mc-server/EffectsMattes D2014-09-131-1/+1
| | |\ | | | | | | | | Added speed entity effect.
| | | * Merge branch 'master' into EffectsHowaner2014-09-121-14/+30
| | | |\
| | | * | Added speed entity effect.Hownaer2014-08-281-1/+1
| | | | |
| * | | | 1.8: Fixed maps.Howaner2014-09-131-4/+4
| | | | |
| * | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-2/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h
| | * | | Play placesound from the middle of the block.Howaner2014-09-121-1/+1
| | | | |
| | * | | Fixed block place sounds.Howaner2014-09-121-2/+14
| | | | |
| | * | | Players in survival mode are not allowed to break a bedrock.Howaner2014-09-121-0/+6
| | | |/ | | |/|
| * | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-1/+1
| |\| |
| | * | Moved sound-configs into BlockID.h and fixed/ added loads of soundsMasy982014-09-091-1/+1
| | | |
| * | | Fixed many right click issues.Howaner2014-09-121-4/+10
| | | |
| * | | 1.8: Fixed eating.Howaner2014-09-121-0/+1
| | | |
| * | | 1.8: Added ParticleEffect packet.Howaner2014-09-111-2/+2
| | | |
| * | | 1.8: Added MultiBlockChange packet.Howaner2014-09-091-3/+4
| | | |
| * | | Added the player list to the 1.8 protocol.Howaner2014-09-091-3/+7
| | | |
| * | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-091-10/+10
| |\| |
| | * | Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-031-10/+10
| | |\ \ | | | | | | | | | | remove y-coord from chunks
| | | * | remove y-coord from chunksLO1ZB2014-08-281-10/+10
| | | | |
| * | | | 1.8: Added new uuid field.Howaner2014-09-091-17/+25
| | | | |
| * | | | More fixes.Howaner2014-09-081-11/+1
| | | | |
| * | | | Fixed more 1.8 packets.Howaner2014-09-081-12/+21
| |/ / /
| * | | Merge branch 'master' into InventoryHowaner2014-09-021-1/+2
| |\ \ \ | | | |/ | | |/|
| * | | Fixed crashes and use std::swap.Hownaer2014-08-281-3/+19
| | |/ | |/|
* | | Added SetCustomName() to players.Howaner2014-09-021-7/+5
| |/ |/|
* | Fire can be destroyed with the sword in creative-modeHownaer2014-08-281-1/+2
|/
* Fixed item drop.Howaner2014-08-221-14/+18
| | | Fixes #1341
* Added initializers for class members.Mattes D2014-08-211-0/+10
| | | | As reported by Coverity, these weren't initialized.
* Merge branch 'master' into FireHowaner2014-08-201-4/+4
|\
| * Exported daylight cycle flag to the protocol.Howaner2014-08-111-9/+3
| |
| * Added a comment and simplified code.Howaner2014-08-101-6/+3
| |
| * Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-071-1/+10
| | | | | | I need this for a GameRule plugin.
* | Revert "Removes the fire if the block under the fire was broken."Howaner2014-08-111-5/+0
| | | | | | This reverts commit 01001d2a49a3366e9b1eccf938d5073ab9a2f06e.
* | Removes the fire if the block under the fire was broken.Howaner2014-08-111-0/+5
| |
* | Moved the clicked-through block check to the top of the function.Howaner2014-08-111-36/+17
| |
* | Fixed cancelled fire interact from all directions.Howaner2014-08-111-4/+12
|/
* Resending fire to the client when the interact cancelled.Howaner2014-08-061-0/+8
|
* Fixed a bug who can used from hacked clients.Howaner2014-08-021-1/+16
|
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-011-1/+2
|\ | | | | Name to UUID
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-311-20/+8
| |\
| * | MojangAPI: Implemented UUID shortening and dashing.madmaxoft2014-07-301-1/+2
| | |
* | | Merge pull request #1272 from Howaner/FoodMattes D2014-08-011-1/+3
|\ \ \ | | | | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
| * | | Compile fix.Howaner2014-08-011-2/+1
| | | |
| * | | Import Statistics.hHowaner2014-07-311-0/+1
| | | |
| * | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.Howaner2014-07-311-1/+3
| | |/ | |/|
* | | Renamed "select..." methods to "set..." and better IsValidEffect() function.Howaner2014-07-311-2/+2
| | |
* | | Renamed functions and added beacon json saving.Howaner2014-07-311-12/+12
| | |
* | | Added beacon.Howaner2014-07-301-0/+54
|/ /
* | Merged branch 'howaner/Options'.madmaxoft2014-07-301-15/+4
|\ \
| * | Fixed group color's.Howaner2014-07-271-15/+4
| |/
* | Slight cleanup after portalsTiger Wang2014-07-291-2/+1
| |
* | SuggestionsTiger Wang2014-07-231-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-9/+9
|\| | | | | | | | | | | | | | | 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-3/+3
| |
| * Fixed attempts to call c_str on ChatColorsarchshift2014-07-191-4/+4
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-191-2/+2
| |
* | Bug and crash fixesTiger Wang2014-07-201-0/+2
| | | | | | | | | | | | | | | | | | * 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-2/+2
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-77/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed creative players not being able to drinkarchshift2014-07-181-3/+4
| | | | | | | | Fixes #1215
| * Normalized comments.madmaxoft2014-07-171-1/+1
| | | | | | | | | | 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 spaces around single-line comments.madmaxoft2014-07-171-11/+13
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * Fixed basic whitespace problems.madmaxoft2014-07-171-10/+10
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-171-3/+4
| |\
| | * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-3/+4
| | |\ | | | | | | | | Skins
| | | * Store properties as Json::ValueTiger Wang2014-07-161-1/+1
| | | |
| | | * Player properties are now retrievedTiger Wang2014-07-141-3/+4
| | | |
| * | | Merge branch 'master' into potionsmadmaxoft2014-07-151-30/+7
| |\| |
| | * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-3/+3
| | |/
| | * Revert failed fix for #31Tiger Wang2014-07-131-27/+4
| | | | | | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e.
| * | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-41/+68
| |\| | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| | * Unnecessary returnHowaner2014-06-301-2/+0
| | |
| | * Fixed respawningTiger Wang2014-06-291-2/+2
| | | | | | | | | | | | * Fixes #1103
| | * Fixed offline UUID generator.Mattes D2014-06-291-2/+4
| | | | | | | | | | | | It generated invalid UUIDs, too many hex chars.
| | * Send statistics to the player, when he logged in.Howaner2014-06-291-0/+3
| | |
| | * Merge pull request #1132 from mc-server/RemoveMD5Mattes D2014-06-291-13/+9
| | |\ | | | | | | | | Removed the md5 library, obsoleted by PolarSSL.
| | | * Removed the md5 library, obsoleted by PolarSSL.Mattes D2014-06-271-13/+9
| | | | | | | | | | | | | | | | Fixes #1130.
| | * | Fixed issue with breaking blocks at -1 coordinatesTiger Wang2014-06-281-6/+1
| | | |
| | * | Added generic entity-collecting.Mattes D2014-06-271-2/+2
| | |/ | | | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
| * | ItemHandler: changed IsDrinkable() to take a short argumentarchshift2014-06-171-3/+4
| | |
| * | Implemented drinkable potions, noeffect entity effect,archshift2014-06-171-3/+3
| | | | | | | | | | | | Clears entity effects on death
| * | Implemented milk, added documentation to Pawn.harchshift2014-06-171-3/+3
| | |
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into portalsTiger Wang2014-06-241-0/+29
|\ \ \ | | |/ | |/|
| * | Added cClientHandle::IsUUIDOnline function.madmaxoft2014-06-211-0/+29
| | | | | | | | | | | | Ref.: #771
* | | Merge branch 'master' into portalsTiger Wang2014-06-211-16/+20
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * | Merge branch 'master' into GlobalFixesHowaner2014-06-171-25/+20
| |\|
| * | Add more documentation.Howaner2014-06-171-0/+2
| | |
| * | Add comment.Howaner2014-06-171-0/+1
| | |
| * | Revert "Fix right click bugs."Howaner2014-06-171-41/+40
| | | | | | | | | This reverts commit 61b6fdde7553dac6e2d5c5a071b9a13fa0d71b2f.
| * | Fix fire break.Howaner2014-05-281-16/+17
| | |
| * | Fix right click bugs.Howaner2014-05-281-40/+41
| | |
* | | Portals animate and delay correctlyTiger Wang2014-06-121-4/+3
| | |
* | | Merge branch 'master' into portalsTiger Wang2014-06-101-21/+17
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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-16/+5
| | | | | | | | | | | | Fixes #1039, fixes #851
| * | Proper fix for long interaction.madmaxoft2014-06-081-7/+14
| | | | | | | | | | | | Fixes #1078 and #1038.
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-2/+1
|\| |
| * | Fixed bad coordinateworktycho2014-06-041-1/+1
| | |
| * | Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-021-1/+0
| |\ \ | | |/ | |/| | | | | | | Conflicts: src/Chunk.cpp
| | * Hopefully fixed piston duplication issuesTiger Wang2014-05-251-1/+0
| | | | | | | | | | | | | | | * Fixes #879 * Fixes #714
* | | Implemented end and nether portalsTiger Wang2014-05-311-4/+3
|/ /
* | ClientHandle.cpp: Process look before posarchshift2014-05-271-1/+1
| |
* | ClientHandle.cpp: remove redundant codearchshift2014-05-261-22/+2
| | | | | | | | HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
* | Revert "Add more move checks"madmaxoft2014-05-261-58/+16
| | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06.
* | Merge pull request #1003 from Howaner/GlobalFixesMattes D2014-05-261-16/+58
|\ \ | |/ |/| Add more move checks
| * Add more move checksHowaner2014-05-161-16/+58
| | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size)
* | Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-191-2/+3
|\ \ | | | | | | Implemented cacti damage
| * | Implemented cacti damageTiger Wang2014-05-181-2/+3
| | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug)
* | | Merge pull request #998 from mc-server/StatManagerMattes D2014-05-181-1/+10
|\ \ \ | |/ / |/| | Statistic Manager
| * | Fixed stat serializationandrew2014-05-111-8/+0
| | |
| * | Statistic Managerandrew2014-05-111-1/+18
| | |
* | | Merge pull request #994 from Howaner/GlobalFixesMattes D2014-05-151-17/+80
|\ \ \ | | |/ | |/| Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
| * | Fix compile error.Howaner2014-05-151-1/+1
| | |
| * | Move radius check.Howaner2014-05-151-25/+40
| | |
| * | Rename HandleBlockDigCancel to FinishDigAnimtion.Howaner2014-05-111-3/+3
| | |
| * | Add block place/break distance check.Howaner2014-05-091-0/+21
| | |
| * | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break.Howaner2014-05-091-17/+44
| |/
* | Merge branch 'master' into SslWebAdminMattes D2014-05-101-5/+32
|\|
| * Simplified the HandleAnvilItemName() code.Howaner2014-05-061-7/+2
| |
| * Changed HandleAnvilItemName() length to size_t in ClientHandle.hHowaner2014-05-051-1/+1
| |
| * Add clicks, exp subtraction, item check, ...Howaner2014-05-051-1/+1
| |
| * Add MC|ItemName plugin message.Howaner2014-05-051-0/+32
| |
| * Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-041-5/+14
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| | * HOOK_DISCONNECT has cClientHandle as its first parameter.madmaxoft2014-05-021-3/+3
| | | | | | | | | | | | Ref.: #655.
| * | Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-1/+2
| | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | | Merged branch 'master' into SslWebAdmin.madmaxoft2014-05-011-2/+2
|\ \ \ | | |/ | |/|
| * | More ClientHandle fixes.madmaxoft2014-05-011-2/+2
| | |
| * | Fixed warnings in ClientHandle.madmaxoft2014-05-011-2/+2
| | |
* | | Fixed crashes in the SSL HTTP connection.madmaxoft2014-05-011-1/+2
|/ /
* | Delayed sending the KeepAlive packet for 3 seconds after login.madmaxoft2014-04-291-0/+5
| | | | | | | | This should alleviate #889.
* | Fixed braces.madmaxoft2014-04-281-1/+5
| |
* | Fixed missing return value warning in MSVC.madmaxoft2014-04-281-0/+1
|/
* More small fixes.archshift2014-04-261-9/+9
|
* Moar alignment.archshift2014-04-261-7/+7
|
* Further refactored, Reverted Minecart changearchshift2014-04-261-57/+21
| | | | Other small changes.
* Merge remote-tracking branch 'upstream/master'archshift2014-04-251-1/+1
|\
| * Fix armor in survival mode.Howaner2014-04-241-1/+1
| |
* | Oops, fixed that.archshift2014-04-251-0/+2
| |
* | Refactored SendChat(), placing the message-type formatting into its own function.archshift2014-04-251-84/+78
|/ | | | Removed default case warning in the process.
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-6/+8
|\ | | | | | | | | 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
| * Declared one mutex as mutable in order to allow for const correct get accessors.jfhumann2014-04-191-4/+4
| |
| * Small style changesjfhumann2014-04-181-1/+1
| |
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-9/+53
| |\ | | | | | | | | | | | | | | | | | | | | | 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-8/+10
| | |
* | | Merge branch 'master' into Enchantingdaniel09162014-04-181-1/+1
|\ \ \ | | |/ | |/|
| * | 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
* | | Removed old includedaniel09162014-04-181-1/+1
| | |
* | | Fixed some Errors (not all)daniel09162014-04-171-7/+10
| | |
* | | Modified many thingsdaniel09162014-04-171-856/+1
| | |
* | | Fixed conflicting enchantments checkingdaniel09162014-04-161-23/+23
| | |
* | | Added deletions from merge conflictdaniel09162014-04-161-0/+875
|/ /
* | Attempted fix for the client crash with the new protocols.madmaxoft2014-04-151-6/+9
| |
* | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-141-8/+22
| | | | | | | | Server works both in online and offline modes with 1.7.9.
* | A client UUID is generated when the server is in offline mode.madmaxoft2014-04-141-0/+24
| | | | | | | | 1.7.9 client works with these changes in offline mode.
* | Added Yggdrasil Authentication Systemdaniel09162014-04-131-2/+5
|/ | | | Code by Howaner. Fixes/Changes by me.
* Merge branch 'master' into HTTPSizeTmadmaxoft2014-04-041-3/+3
|\
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-041-2/+2
| |
| * Simplified and fixed slabs, fixes #835Tiger Wang2014-03-311-1/+1
| |
* | Fixed All signedness warnings in HTTPServer.cppTycho2014-04-021-1/+1
|/
* Merge pull request #838 from mc-server/lilypadsworktycho2014-03-301-6/+8
|\ | | | | Lilypads
| * Compare for inequality in FACE_NONE checksTiger Wang2014-03-291-3/+3
| |
| * Removed leftover clienthandle codeTiger Wang2014-03-291-10/+6
| |
| * Fixed block interaction rate checkTiger Wang2014-03-281-2/+4
| |
| * Implemented lilypad placementTiger Wang2014-03-231-4/+8
| |
* | Fixed players not updating after world changeTiger Wang2014-03-291-4/+2
|/ | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526
* Merge branch 'Werror' into warningsTycho2014-03-121-3/+0
|\ | | | | | | | | Conflicts: src/Globals.h
| * Merge branch 'master' into WerrorTycho2014-03-121-3/+0
| |\ | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp
| | * Unified Vector classesandrew2014-03-111-3/+0
| | |
* | | Fixed a load of format string errorsTycho2014-03-111-1/+1
|/ /
* / Removed Some unnessicary macrosTycho2014-03-101-13/+0
|/
* Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-091-29/+19
|\ | | | | Ballistic firework missiles
| * != FACE_NONETiger Wang2014-03-091-1/+1
| |
| * Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-9/+28
| |\ | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | Fixed data length issuesTiger Wang2014-03-091-1/+1
| | |
| * | CheckBlockInteractionsRate() fixed & enabledTiger Wang2014-03-091-29/+19
| | |
* | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-091-28/+30
|\ \ \ | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
| * | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-081-28/+30
| | | |
* | | | Merge pull request #775 from worktycho/warningsMattes D2014-03-091-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fixed a few warnings
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-2/+2
| |/ /
* / / Slight plugin messaging changesTiger Wang2014-03-091-0/+13
|/ / | | | | | | | | - Clients are not allowed to register duplicate channels - Clients are not allowed to use channels that were not registered
* | Add data backsending, when the Client interacts a Block and the Interact is cancelled.Howaner2014-03-051-4/+10
| |
* | cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-3/+3
| |
* | Merge pull request #738 from xdot/masterMattes D2014-03-021-1/+1
|\ \ | | | | | | Refactored global block property arrays
| * | g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-1/+1
| |/
* | Use switch in GetStepSoundHowaner2014-02-281-1/+1
| |
* | Fix Double Slabs, fix Slab Meta and add more things to burnableHowaner2014-02-281-1/+1
|/
* Merge pull request #669 from xdot/masterTiger Wang2014-02-241-0/+27
|\ | | | | Implementation of in-game maps :D
| * Manual merge (Fixed conflicts)andrew2014-02-201-9/+34
| |\
| * | Map decorators; Map clientsandrew2014-02-181-13/+9
| | |
| * | Map item handler; Fixed several bugsandrew2014-02-171-2/+0
| | |
| * | cMap::UpdateRadiusandrew2014-02-151-0/+2
| | |
| * | Send map when selectedandrew2014-02-141-0/+13
| | |
| * | Implementation of in-game mapsandrew2014-02-131-0/+18
| | |
* | | Use the ItemCategorie::IsSword() Method.Howaner2014-02-231-1/+1
| | |
* | | No Sword Block Destroying in Creative ModeHowaner2014-02-231-0/+10
| | |
* | | cClientHandle manages the client-registered plugin channels.madmaxoft2014-02-201-10/+77
| |/ |/| | | | | Fixes #706.
* | Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+8
| | | | | | | | + Implemented paintings
* | Links sent via chat messages are clickable.madmaxoft2014-02-161-8/+14
| | | | | | | | Fixes #658.
* | Add Locale to ClientHandleHowaner2014-02-161-0/+1
| |
* | Implemented cCompositeChat.madmaxoft2014-02-151-1/+11
|/ | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
* Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-5/+5
|\ | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * Improved Type safety of eBlockFaceTycho2014-02-041-5/+5
| | | | | | | | May Fix #640
* | Added sender name to PM if prefixes disabledTiger Wang2014-02-071-1/+1
| | | | | | | | * Also moved the PVP setting into Mechanics
* | Improved chat messaging functionsTiger Wang2014-02-071-6/+108
| | | | | | | | | | | | | | * 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-8/+6
| |
* | Reduced max explosions per tickTiger Wang2014-02-051-1/+1
| |
* | Fixed explosions bugTiger Wang2014-02-051-20/+10
| | | | | | | | * Fixed bug where explosions would sometimes never be sent
* | Fixed a crash bugTiger Wang2014-02-031-8/+2
| |
* | Server now handles join messages alsoTiger Wang2014-02-031-9/+11
|/ | | | * Revised as well hook documentation
* Changed Signiture of OnDiggingTycho2014-02-011-3/+3
|
* Changed Signiture of OnDestroyedByPlayerTycho2014-02-011-3/+4
|
* Changed pointers to referencesTycho2014-02-011-4/+3
|
* Changed signitures of Several BLockHandler MethodsTycho2014-02-011-1/+2
| | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-27/+12
|\ | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * Merge pull request #587 from mc-server/mobimprovementsMattes D2014-01-251-1/+1
| |\ | | | | | | Mob improvements & rudimentary artificial intelligence
| | * Two minor changesTiger Wang2014-01-251-1/+1
| | |
| * | Fixed a possible deadlock on client disconnect.madmaxoft2014-01-241-9/+0
| |/
| * Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-241-2/+3
| |\
| | * Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-231-2/+3
| | |
| * | Command block fixes 2andrew2014-01-231-16/+9
| | |
* | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-1/+4
| | |
* | | First attempt at Implementing InterfacesTycho2014-01-251-1/+1
|/ /
* | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-8/+22
|\|
| * Merge pull request #565 from mc-server/commandblockfixesMattes D2014-01-191-3/+21
| |\ | | | | | | Command block fixes
| | * Removed unneeded paramtersTiger Wang2014-01-191-2/+2
| | |
| | * Changed SendBlockEntity format slightlyTiger Wang2014-01-191-3/+6
| | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
| | * Implemented MC|Brand responseTiger Wang2014-01-191-3/+9
| | |
| | * Improved command blocksTiger Wang2014-01-191-0/+9
| | | | | | | | | | | | | | | | | | | | | * 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
| * | Rewritten SocketThreads for proper shutdown scenario.madmaxoft2014-01-191-5/+1
| |/ | | | | | | This fixes #560 and #390.
* | Scoreboard SendTo()andrew2014-01-211-0/+3
| |
* | Scoreboard protocol supportandrew2014-01-211-0/+30
|/
* Command block fixesandrew2014-01-181-5/+12
|
* Parse the MC|AdvCdm plugin messageandrew2014-01-181-0/+64
|
* Removed obsoleted functionsTiger Wang2014-01-161-2/+2
|
* Implemented Ctrl-Q drop stackTiger Wang2014-01-151-0/+11
| | | | Also fixed an issue with TossItems not respecting count.
* Added cClientHandle::SendPluginMessage().madmaxoft2014-01-091-0/+9
| | | | It is not yet exported in the API, though.
* Plugin messages are received and handed to plugins.madmaxoft2014-01-071-0/+9
| | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* fixed ClientHandle warningsTycho Bickerstaff2013-12-311-0/+1
|
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+9
|
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-21/+20
|
* Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-191-4/+26
|\ | | | | Multiple fixes
| * Fixed PlayerAbilities and creativeTiger Wang2013-12-191-3/+3
| |
| * Fixed 1.7 arm swing animationTiger Wang2013-12-191-1/+23
| |
* | Disconnection message no longer shown if pingTiger Wang2013-12-181-5/+8
| |
* | The "<>" of a player name is now colouredTiger Wang2013-12-181-1/+1
| |
* | Fixed 1.7 player disconnection not calling hookTiger Wang2013-12-181-4/+14
|/ | | | This fixes #357
* Renamed back EntityAnimation to PlayerAnimationTiger Wang2013-12-181-1/+1
| | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4
* Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-161-6/+43
| | | | | 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.
* Fixed multiple player spawn broadcasts.madmaxoft2013-12-161-3/+0
|
* Merge pull request #437 from mc-server/ShootTo_functionSTRWarrior2013-12-151-2/+0
|\ | | | | Shoot to function
| * This adds a function that allows you to 'shoot' a player towards a direction.STRWarrior2013-12-151-2/+0
| |
* | Fixed calling OnPlayerJoined() in the wrong place.madmaxoft2013-12-151-6/+1
|/ | | | This is the first part of a fix for #187.
* Moved reading flags to the protocol.STRWarrior2013-12-151-17/+3
|
* Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-151-0/+33
|
* Forgot to commit the ClientHandle.STRWarrior2013-12-141-0/+18
|
* Unknown packet type extended to 32 bits.madmaxoft2013-12-121-3/+3
|
* 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
* | Fixed trapdoors not togglingTiger Wang2013-12-071-1/+1
| | | | | | | | The redstone simulator kept on resetting them.
* | Renamed animation functionTiger Wang2013-12-071-7/+7
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed bed leave animationTiger Wang2013-12-061-1/+1
| |
* | Updated comments for slabsTiger Wang2013-12-061-5/+6
|/
* Switched to using provided ReadItem function.Samuel Barney2013-12-021-0/+9
| | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
* Properly fixed snow height, fixes #98 and #264Tiger Wang2013-11-301-9/+14
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+9
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+12
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+2198
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:48:45 +0100