65d2ef32e9
Merge pull request #1734 from mc-server/pistons
...
Handle client 'leave bed' request
2015-03-14 22:44:04 +01:00
a96c21fc0d
Merge branch 'master' into Inventory
2015-03-09 22:39:11 +01:00
f3da0cf1ae
Reverted non-functional changes
2015-03-05 21:21:39 +00:00
b474b9fb5d
Fixed race condition for TCP link deleting.
...
This could have caused crashes when a client disconnected from the server.
2015-02-22 19:06:04 +01:00
3869f76cc2
Handle client 'leave bed' request
...
* Fixes #1728
2015-02-08 21:21:48 +00:00
2c7925f0ad
Merge branch 'master' into Inventory
2015-02-06 21:52:14 +01:00
19d463ae1c
Fixed a deadlock in cClientHandle network sending.
2015-01-27 14:53:38 +01:00
4eecf9363a
Client: Only decode protocol when there's actual data incoming.
2015-01-27 14:53:36 +01:00
edce2cbdcf
Fixed enchant packet handling.
2015-01-27 14:53:34 +01:00
7dfeb67f01
Converted cServer to use the cNetwork API.
2015-01-27 14:53:31 +01:00
1eedccc56a
Merge branch 'master' into Inventory
2015-01-25 00:34:19 +01:00
5ac3a23586
Fixed warnings in 1.7 protocol.
2015-01-18 22:43:35 +01:00
ccdf03daaf
Refactored all player block placing to go through hooks.
...
Fixes #1618 .
2014-12-24 07:20:17 +01:00
b6fd400276
Own classes for all windows.
2014-12-13 15:06:55 +01:00
33c6ff872e
Cosmetic touchups.
...
Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
2014-12-11 14:34:09 +01:00
32bce44f1f
Merge pull request #1623 from p-mcgowan/issue_1253
...
Prevent multiple logins with same username, unless allowed in settings
2014-12-10 11:17:11 +01:00
9bba8e4c7d
Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin()
...
Compiles correctly.
2014-12-10 00:45:24 -08:00
3a2759fdc1
Fixed return value in CheckMultiLogin()
2014-12-09 14:23:44 -08:00
4b08ca261b
Fixed indent problems and added return definitions to CheckMultiLogin().
...
Changed from IsAllowMultiLogin() to DoesAllowMultiLogin().
Fixed CheckMultiLogin() to not run to the end without returning a value.
2014-12-09 03:06:25 -08:00
12c012fa01
Changed CheckMultiLogin() to not have main body wrapped in an if statement.
...
Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin().
Added doxy-comment for DoWithPlayer().
Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments.
2014-12-08 14:33:59 -08:00
e28cc876c4
created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World.
2014-12-08 00:57:46 -08:00
6de07d4a39
Fixed compile errors
2014-12-08 00:45:29 -08:00
656964dc38
removed last space in handlehandshake
2014-12-08 00:19:33 -08:00
ed09e76023
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.
2014-12-08 00:16:09 -08:00
d8d3b9aec5
Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added.
2014-12-08 00:12:48 -08:00
83c728fce4
Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253
2014-12-07 12:45:39 -08:00
8edfd78295
changed from using iterator to auto for server and clienthandle
2014-12-07 12:41:42 -08:00
3c3cb198f3
Fixed c++11 branch issues.
2014-12-07 15:46:27 +01:00
3acdf25b05
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
e2a04f580a
BasicStyle: Added missing braces to control statements.
2014-12-05 16:59:11 +01:00
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
438a9b04cb
Changed Kick message
2014-11-29 16:05:22 -08:00
9caa3b19c1
removed extra space and fixed some formatting in cCallback
2014-11-29 15:59:48 -08:00
72797b14fe
Uses callback for players already in World.
2014-11-29 15:44:38 -08:00
a7bf2725c8
fixed naming of strings and changed from i to I
2014-11-29 11:22:03 -08:00
61e761fdc2
issue 1253 - prevent multiple logins with same username
2014-11-29 00:36:15 -08:00
c1a52dc9fb
ClientHandle: Fixed max block place distance check.
...
Fixes #1492
2014-11-25 21:24:25 +01:00
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
9ece37e8f1
Merge pull request #1598 from mc-server/SignEditor
...
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
ae15c2f78e
Fixed a wrong assert in cClientHandle::SetViewDistance().
2014-11-17 12:34:14 +01:00
277151582f
Use LastPlacedSign instead of LastPlacedBlock.
2014-11-15 22:36:31 +01:00
09cea625fc
Renamed m_UsedViewDistance to m_CurrentViewDistance
2014-11-15 22:26:54 +01:00
927d8d7702
Renamed m_SetViewDistance to m_RequestedViewDistance
2014-11-15 15:33:42 +01:00
78fb789631
Fixed a security problem with signs.
2014-11-15 15:16:52 +01:00
83d3f3347b
Use m_UsedViewDistance and m_SetViewDistance.
2014-11-14 22:53:12 +01:00
a0e1e43fc1
Merge branch 'master' into ViewDistance
2014-11-14 22:33:54 +01:00
d93acb841f
Fixed m_SentChunks list chunk removing.
2014-10-30 22:04:04 +01:00
9c7661f50f
Added a MaxViewDistance option.
2014-10-30 21:24:10 +01:00
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
9af58a81d6
Use 3 priorities.
2014-10-23 21:19:43 +02:00
72bb299a4a
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
2014-10-23 14:59:42 +02:00
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
b0988e65aa
Use two lists and 2 chunk send prioritys.
2014-10-21 17:35:23 +02:00
a07456d712
New c++11 stuff.
2014-10-21 17:00:41 +02:00
44514e53fc
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
aa19a3afb0
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
2874bf73be
Merge pull request #1502 from mc-server/furnaces
...
Improved furnaces
2014-10-18 21:33:55 +01:00
8c2a99711e
Merged branch 'fix_chunks'.
2014-10-16 21:12:26 +02:00
eeb580a74e
Functions in cPluginManager get references instead of pointers.
2014-10-15 19:09:09 +02:00
c6725f8d28
Usernames are lowercased before generating offline UUID.
...
This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization.
2014-10-15 13:41:23 +02:00
97623fc634
Added distance check.
2014-10-07 21:36:01 +02:00
b493beb3bb
Stream 4 chunks per tick. Added priority.
2014-10-06 21:27:53 +02:00
a59f2d15fb
Merge branch 'master' into ChunkLoader
2014-10-06 17:38:42 +02:00
5a6b86180e
Better StreamNextChunk() method
2014-10-06 17:38:17 +02:00
a8aeceab9d
cClientHandle: Added protocol version knowledge.
2014-10-05 20:19:21 +02:00
b5a2c6667a
Improved furnaces
...
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
382e014ebc
Optimized chunk loader
2014-10-02 23:50:41 +02:00
d7066f43d3
Rewritten plugin messages, vanilla are being parsed directly.
...
This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
2014-09-30 13:33:57 +02:00
5a44be13b7
Fixed trailing whitespace.
2014-09-28 22:17:29 +02:00
8d55cd409e
Merge pull request #1466 from mc-server/endofsupport
...
Removed protocols 1.2 to 1.6
2014-09-28 22:04:30 +02:00
79110b29db
Combined conditions
2014-09-27 21:49:03 +02:00
fc22ba0ce8
Added barriers correctly
2014-09-27 21:07:52 +02:00
72c087cfd3
Dropped support for <1.7.x
2014-09-27 14:28:14 +01:00
d83d6456e8
Fixed players custom name in 1.8
2014-09-26 17:37:19 +02:00
4b38e077cf
Merge branch 'master' into EntityCustomName
...
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
2014-09-23 14:39:49 +02:00
4398156b2e
Merge branch 'master' into 1.8-Protocol
2014-09-19 14:31:18 +02:00
43ed690520
Exported player list states to extra functions.
2014-09-18 18:50:17 +02:00
010879e43f
BungeeCord compatibility: don't overwrite UUID / properties.
2014-09-17 16:01:14 +02:00
92e7e5c615
Merge branch 'master' into 1.8-Protocol
2014-09-14 14:16:17 +02:00
5b63a7fe98
Merge pull request #1353 from mc-server/Effects
...
Added speed entity effect.
2014-09-13 17:05:59 +02:00
b462416e1f
1.8: Fixed maps.
2014-09-13 02:20:04 +02:00
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
1223a24d3c
Merge branch 'master' into Effects
2014-09-12 19:13:46 +02:00
20f3757d54
Play placesound from the middle of the block.
2014-09-12 18:14:32 +02:00
010ac1e5f7
Fixed block place sounds.
2014-09-12 18:12:42 +02:00
a1716bb415
Players in survival mode are not allowed to break a bedrock.
2014-09-12 15:57:37 +02:00
bee615b75b
Merge branch 'master' into 1.8-Protocol
2014-09-12 13:28:06 +02:00
f2c5d8a761
Fixed many right click issues.
2014-09-12 13:19:33 +02:00
4e2d75bde5
1.8: Fixed eating.
2014-09-12 01:37:19 +02:00
3bd3ac2200
1.8: Added ParticleEffect packet.
2014-09-11 17:03:09 +02:00
71c3369e08
1.8: Added MultiBlockChange packet.
2014-09-09 18:27:31 +02:00
acae3c9c65
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
2014-09-09 16:00:26 +02:00
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
6fb0a76b1e
Merge branch 'master' into 1.8-Protocol
2014-09-09 01:55:21 +02:00
4b1f4e8d7e
1.8: Added new uuid field.
2014-09-09 01:52:51 +02:00
76fa3a7ccd
More fixes.
2014-09-08 20:12:43 +02:00
8f8693a71e
Fixed more 1.8 packets.
2014-09-08 17:02:54 +02:00
c140ba2367
Merge pull request #1351 from LO1ZB/remove-a_RelY
...
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
e431bb4e63
Merge branch 'master' into Inventory
2014-09-02 20:11:38 +02:00
1bb4d79412
Added SetCustomName() to players.
2014-09-02 19:12:35 +02:00
240ec9b4bd
Added speed entity effect.
2014-08-28 23:02:20 +02:00
4470ebffd7
Fire can be destroyed with the sword in creative-mode
2014-08-28 20:49:34 +02:00
6c3b80f04c
Fixed crashes and use std::swap.
2014-08-28 14:58:03 +02:00
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
8fa4ac9ad9
Fixed item drop.
...
Fixes #1341
2014-08-22 15:32:27 +02:00
64fec204c4
Added initializers for class members.
...
As reported by Coverity, these weren't initialized.
2014-08-21 22:39:53 +02:00
f7774ec336
Merge branch 'master' into Fire
2014-08-20 22:25:05 +02:00
cb98014582
Revert "Removes the fire if the block under the fire was broken."
...
This reverts commit 01001d2a49
2014-08-11 23:12:32 +02:00
01001d2a49
Removes the fire if the block under the fire was broken.
2014-08-11 22:37:28 +02:00
74fabb079c
Moved the clicked-through block check to the top of the function.
2014-08-11 22:34:33 +02:00
202a0d1c1d
Fixed cancelled fire interact from all directions.
2014-08-11 14:24:36 +02:00
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
42bad0edec
Added a comment and simplified code.
2014-08-10 20:06:03 +02:00
4271d719b6
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
...
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
ff7171fc5a
Resending fire to the client when the interact cancelled.
2014-08-06 14:04:25 +02:00
3b4255dbfe
Fixed a bug who can used from hacked clients.
2014-08-02 00:14:05 +02:00
941a182d8a
Merge pull request #1255 from mc-server/NameToUUID
...
Name to UUID
2014-08-01 22:35:12 +02:00
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
86d84bcb73
Compile fix.
2014-08-01 17:29:17 +02:00
160fa3a9a9
Import Statistics.h
2014-07-31 23:56:49 +02:00
6d02fce9a2
Merged branch 'master' into NameToUUID.
2014-07-31 23:17:49 +02:00
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
6b1f7e7a45
Renamed "select..." methods to "set..." and better IsValidEffect() function.
2014-07-31 18:15:39 +02:00
556fc908ae
Renamed functions and added beacon json saving.
2014-07-31 12:13:11 +02:00
89b1bbdc5f
Added beacon.
2014-07-30 21:59:35 +02:00
17a94b16ea
MojangAPI: Implemented UUID shortening and dashing.
2014-07-30 13:56:30 +02:00
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
7f9f46c911
Fixed group color's.
2014-07-27 13:47:21 +02:00
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6ab9afd0fd
Bug and crash fixes
...
* 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
2014-07-20 10:46:45 +01:00
52add840cf
Fixed attempts to call c_str on ChatColors
2014-07-19 11:15:21 -07:00
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
37140ae578
Merge branch 'master' into portals
...
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
2014-07-18 20:10:51 +01:00
9529a42559
Fixed creative players not being able to drink
...
Fixes #1215
2014-07-18 01:56:26 -07:00
2423fbf2ef
Normalized comments.
...
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.
2014-07-17 22:15:34 +02:00
7fff12bfac
Fixed spaces around single-line comments.
...
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
993fd14ddf
Fixed basic whitespace problems.
...
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
1f6854792c
Store properties as Json::Value
2014-07-16 00:03:47 +01:00
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
e11f41d048
Revert failed fix for #31
...
This reverts commit 69dc9b4c9a
2014-07-13 00:17:31 +01:00
Mattes D
Howaner
Tiger Wang
Vincent
Masy98
LO1ZB
archshift