summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed enchant packet handling.Mattes D2015-01-271-3/+3
|
* Converted cServer to use the cNetwork API.Mattes D2015-01-271-108/+106
|
* 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.
* 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:27:51 +0100