flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,511 Commits 1 Branch 0 Tags 92 MiB
950aeffff8
Commit Graph

525 Commits

Author SHA1 Message Date
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
madmaxoft
d04ab9b703 Fixed compiler warnings in 1.8 protocol. 2014-09-23 22:12:48 +02:00
Howaner
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
Howaner
1aa64f32e1 Updated README.md 2014-09-22 22:07:58 +02:00
Howaner
fc11818f4c Hotfixed 1.8 item reading. 2014-09-22 22:06:08 +02:00
Howaner
9cddffb6df Changed metadata reading again. 2014-09-22 21:18:13 +02:00
Howaner
bcb11078e3 Fixed item nbt reading. 2014-09-22 17:15:08 +02:00
Howaner
718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
Howaner
6aa331a4fa Code improvements. 2014-09-19 15:07:01 +02:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
Howaner
be6d4a5912 1.8: Simplified item metadata reading. 2014-09-18 16:04:03 +02:00
madmaxoft
16e9deba8d Added an explicit setting for allowing BungeeCord handshake. 2014-09-17 20:56:33 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
madmaxoft
82317709f8 Full BungeeCord compatibility. 
Fixes #1392.
Fixes SpigotMC/BungeeCord#1211.
 2014-09-17 11:07:42 +02:00
madmaxoft
3406957f1b Initial BungeeCord support. 
Ref.: #1392
 2014-09-17 09:38:06 +02:00
Howaner
63142a7eb1 Simplified WriteUUID() 2014-09-14 20:08:18 +02:00
Howaner
382a42b3d6 Fixed warnings. 2014-09-14 14:24:28 +02:00
Howaner
94d562502d 1.8: Updated scoreboard packets. 2014-09-13 21:48:16 +02:00
Howaner
f323955099 Moved chat json creating to the CompositeChat class. 2014-09-13 20:27:10 +02:00
Howaner
b462416e1f 1.8: Fixed maps. 2014-09-13 02:20:04 +02:00
Howaner
69afc4dbba Merge branch 'master' into 1.8-Protocol 
Conflicts:
	src/Items/ItemHoe.h
 2014-09-13 01:21:43 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
0d34fc9f31 Fixed wrong buffer length in the 1.8 protocol. 2014-09-12 13:01:23 +02:00
Howaner
34bcd3dd58 1.8: Fixed ReadItem() 2014-09-12 02:42:04 +02:00
Howaner
eb19eff5ac 1.8: Added difficulty sending 2014-09-12 02:00:28 +02:00
Howaner
8151c79a87 1.8: Fixed block entities. 2014-09-12 01:44:20 +02:00
Howaner
85ec697d32 1.8: Fixed workbench, enchanting and anvil window. 2014-09-12 01:15:21 +02:00
Howaner
e10237fb4d 1.8: Enderman, byte -> short 2014-09-12 00:41:07 +02:00
Howaner
a02d96d1f5 1.8: Fixed enderman spawning. 2014-09-12 00:36:46 +02:00
Howaner
c7044fa1dd 1.8: Fixed inventory open packet. 2014-09-11 23:17:27 +02:00
Howaner
6d5a5eb665 Removed GetProtocolVersion() from the protocols. 2014-09-11 22:27:35 +02:00
Howaner
d815aeaefd 1.8: Fixed sign placing. 2014-09-11 22:21:53 +02:00
Howaner
c45bf7cf55 1.8: Fixed hangings. 2014-09-11 20:06:28 +02:00
Howaner
3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Howaner
71c3369e08 1.8: Added MultiBlockChange packet. 2014-09-09 18:27:31 +02:00
Howaner
f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Howaner
6fb0a76b1e Merge branch 'master' into 1.8-Protocol 2014-09-09 01:55:21 +02:00
Howaner
d1d4f2146e PlayerSpawn packet: Send the correct uuid. 2014-09-09 01:54:40 +02:00
Howaner
4b1f4e8d7e 1.8: Added new uuid field. 2014-09-09 01:52:51 +02:00
Howaner
76fa3a7ccd More fixes. 2014-09-08 20:12:43 +02:00
Howaner
e740739d04 Recoded cProtocol180 class. 2014-09-08 19:24:33 +02:00
Howaner
fa2b69b3f3 1.8: Fixed tab complete. 2014-09-08 17:08:28 +02:00
Howaner
8f8693a71e Fixed more 1.8 packets. 2014-09-08 17:02:54 +02:00
Howaner
38124bcce3 Updated chunk sending to 1.8 2014-09-08 12:24:06 +02:00
Howaner
10a30a03e3 Added GetProtocolVersion() to cProtocol. 2014-09-08 11:35:21 +02:00
Howaner
09ff17b71e Implemented packet compression. 
ChunkData packet needs this.
 2014-09-08 00:36:30 +02:00
Mattes D
0a651b9fd8 Added Y-wise asserts to signs. 
This should help detect #1313's second case.
 2014-09-06 18:59:17 +02:00
Mattes D
868723ce50 Alpha-sorted protocol 1.7 senders. 2014-09-06 18:57:57 +02:00
Howaner
da28c70def Fixed client errors. 2014-09-04 19:03:21 +02:00
Howaner
07fba5c98e Added more 1.8 protocol things. 2014-09-04 03:22:35 +02:00
Howaner
157f1c6688 Started implementing of the 1.8 protocol. 2014-09-04 00:29:36 +02:00
Howaner
42dcd534df Merge branch 'master' into EntityCustomName 2014-09-02 19:36:14 +02:00
Howaner
1bb4d79412 Added SetCustomName() to players. 2014-09-02 19:12:35 +02:00
Howaner
7c4cb9a385 Added CustomName to cMonster. 2014-09-01 20:12:56 +02:00
worktycho
de30a8c8c6 Make sure packets are valid 
Fixes CID 66408, 66409 and 72045
 2014-09-01 18:18:07 +01:00
worktycho
b6d77d9679 Init RankMgr pointer to NULL 2014-08-31 20:26:08 +01:00
Mattes D
be32c0527c Merge pull request #1290 from mc-server/Ranks 
Rewriting permission system to use UUIDs and Ranks
 2014-08-26 15:23:21 +03:00
Mattes D
bf16c5ed92 Type warning fixes. 2014-08-25 18:25:39 +03:00
Mattes D
8f20c359cd Fixed a type warning. 2014-08-25 07:28:45 +02:00
Mattes D
e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Mattes D
d471ee8a9d Fixed 1.7.2 login packet reading. 
Fixes #1317.
 2014-08-21 21:38:57 +02:00
Mattes D
0c04bf962e cMojangAPI updates cRankManager's playernames. 2014-08-21 20:47:52 +02:00
Mattes D
936604ca95 cMojangAPI: Fixed MakeUUID___() bindings. 
ToLua would generate a shadow return value for the input strings.
 2014-08-21 15:19:30 +02:00
STRWarrior
3a113e3a75 Merge pull request #1339 from mc-server/Hooks 
Added HOOK_SERVER_PING
 2014-08-20 22:57:48 +02:00
Howaner
4da61e67d7 Renamed a_Motd to a_ServerDescription. 2014-08-20 22:22:38 +02:00
Howaner
cf5ab14ca5 Added a_ClientHandle to the HOOK_SERVER_PING hook. 2014-08-20 22:19:50 +02:00
Howaner
cfdf39a75f Added "HOOK_SERVER_PING" call to older protocols 2014-08-20 16:12:05 +02:00
Howaner
2cca4d70c8 Cleaned up code. 2014-08-20 16:04:18 +02:00
Howaner
228dd61995 Added HOOK_SERVER_PING 2014-08-20 16:01:30 +02:00
Franz Reiter
8f0c4911f7 Merge pull request #1296 from mc-server/LuaAPI 
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
 2014-08-12 16:05:33 +02:00
madmaxoft
0a52ed6eb9 cProtocol172: Check return values. 
Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431
 2014-08-11 15:33:20 +02:00
Howaner
47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
archshift
92f67789fc Gave names to unnamed enums 2014-08-10 15:06:59 -07:00
madmaxoft
9113b45673 MojangAPI: Fixed PlayerNameToUUID(). 2014-08-04 23:35:50 +02:00
Howaner
f5b71cc1f8 Fixed #1286 2014-08-04 20:16:52 +02:00
Mattes D
7b986e65d2 Merge pull request #1285 from mc-server/StrCaseRefactor 
Refactored case-conversion functions.
 2014-08-04 12:02:57 +02:00
madmaxoft
1fa210c7f9 Refactored case-conversion functions. 
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
 2014-08-04 11:30:20 +02:00
Howaner
8cdcfcceb3 Changed properties for-loop. 2014-08-04 11:26:31 +02:00
Howaner
977a9948b9 Fixed skins in mc 1.7.9/1.7.10 2014-08-03 22:15:26 +02:00
madmaxoft
21f52676f3 cMojangAPI: Added UUID-to-Name lookup. 
Also fixed the bindings, now all functions are static-like.
 2014-08-03 22:04:51 +02:00
madmaxoft
003f18bd0f Added cMojangAPI:GetUUIDFromPlayerName(). 
This is a simpler way to ask for a single name -> uuid conversion.
 2014-08-03 22:04:50 +02:00
Mattes D
941a182d8a Merge pull request #1255 from mc-server/NameToUUID 
Name to UUID
 2014-08-01 22:35:12 +02:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
madmaxoft
70fd7caf1f Removed trailing whitespace. 2014-07-31 22:54:45 +02:00
madmaxoft
59adf113f0 MojangAPI: Moved the settings to a separate ini section. 2014-07-31 17:22:48 +02:00
Howaner
556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
madmaxoft
8b519bf6e2 MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). 2014-07-31 10:02:50 +02:00
Howaner
89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
madmaxoft
0336e12cee MojangAPI: Renamed cache file to MojangAPI.sqlite. 2014-07-30 17:09:41 +02:00
madmaxoft
85d64d291a MojangAPI: Clarified the UUID conversion code. 2014-07-30 14:09:30 +02:00
madmaxoft
17a94b16ea MojangAPI: Implemented UUID shortening and dashing. 2014-07-30 13:56:30 +02:00
madmaxoft
6476bd0e2e Exported cMojangAPI to Lua. 2014-07-30 13:56:29 +02:00
madmaxoft
4dd858f899 Added a cMojangAPI class for PlayerName -> UUID lookups, with cache. 
The cache is persisted into a SQLite DB file on server shutdown.
 2014-07-30 13:56:29 +02:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
madmaxoft
f5f9656917 cAuthenticator: Added GetUUIDsFromPlayerNames(). 2014-07-28 12:37:48 +02:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
Tiger Wang
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
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
archshift
52add840cf Fixed attempts to call c_str on ChatColors 2014-07-19 11:15:21 -07:00
madmaxoft
08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
madmaxoft
1cb26bda8e Fixed spaces after commas in protocol data. 
The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
 2014-07-19 15:07:28 +02:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Mattes D
4293db5eae Merge pull request #1214 from mc-server/anti-glob 
CMake - Explicitly lists all source files
 2014-07-19 14:29:22 +02:00
archshift
f94cf49980 Authenticator.cpp: Killed a global destructor warning 2014-07-18 21:38:55 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
15aacc24a5 Protocol/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang
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
archshift
33b0a719da ProtocolRecognizer.cpp: removed unused NumBytesRead 2014-07-17 18:39:44 -07:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
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
Mattes D
e444106d09 Merge pull request #1192 from mc-server/skinuuid 
Skins
 2014-07-16 13:30:57 +02:00
Tiger Wang
c5d00f3ec5 Suggestions 2014-07-16 12:05:09 +01:00
Tiger Wang
ad247735fd Function rename 2014-07-16 11:23:26 +01:00
Tiger Wang
f2c4f56ccd Unified functions 
Thanks @Howaner!
 2014-07-16 11:21:02 +01:00
Tiger Wang
1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
madmaxoft
31415aec63 Fixed MSVC warnings in SoundEffect functions. 2014-07-13 13:31:09 +02:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests 
Implemented trapped chests & others
 2014-07-12 23:24:32 +01:00
Tiger Wang
372dbbb994 Merge pull request #1135 from mc-server/fixes 
Fixes to projectiles and the undead
 2014-07-09 09:50:38 +01:00
Tiger Wang
9e44b0aae1 Implemented trapped chests & others 
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
 2014-07-06 23:50:22 +01:00
Tiger Wang
f4e11d194e Crash and compile fix 2014-07-04 22:07:26 +01:00
Tiger Wang
b9d4431f6f Fixed respawning 
* Fixes #1103
 2014-06-29 22:44:16 +01:00
Howaner
50e112788b Send statistics to the player, when he logged in. 2014-06-29 01:40:15 +02:00
Mattes D
9926abd4f5 Added generic entity-collecting. 
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
 2014-06-27 20:56:44 +02:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Tiger Wang
29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Tiger Wang
bfa8aaf41b Merge branch 'master' into portals 
Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp
 2014-06-10 20:51:22 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Tiger Wang
86e5273cd1 Merge remote-tracking branch 'origin/master' into portals 2014-06-04 13:14:38 +01:00
Tiger Wang
8bff3e5af2 Implemented end and nether portals 2014-05-31 22:28:51 +01:00
madmaxoft
10273f64a2 Fixed a crash in message formatter. 
The code would fail if a message is sent to a player not yet added to a world.
 2014-05-28 22:41:23 +02:00
Tiger Wang
3a9543178a cCompositeChat message type is now formatted 2014-05-19 21:16:29 +01:00
Tiger Wang
42c36429d7 Added client translation to achievements 2014-05-19 20:40:56 +01:00
andrew
b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +03:00
andrew
c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
Howaner
fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner
d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
madmaxoft
383fe0cc1e Hotfixed Chunked transfer encoding in Yggdrasil. 
By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed.
 2014-05-03 23:59:45 +02:00
madmaxoft
eaf3dcb9f7 Fixed connection encryption. 
Fixes #975.
 2014-05-03 23:46:04 +02:00
madmaxoft
ed75d3a836 Fixed warnings in ClientHandle. 2014-05-01 22:58:58 +02:00
madmaxoft
58929a9948 Removed the unused cBlockingTCPLink class. 2014-04-30 17:06:46 +02:00
madmaxoft
c045bb3f4c Removed unneeded #includes. 2014-04-29 17:45:20 +02:00
madmaxoft
6cb2d2461f Moved the rest of the Crypto objects into their own respective files. 2014-04-29 17:37:15 +02:00
madmaxoft
ec33bbe294 Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. 2014-04-29 11:04:54 +02:00
madmaxoft
0b16e6821f Merged branch 'master' into SslWrappers. 2014-04-28 22:05:02 +02:00
madmaxoft
bab3a3cd31 Added the G1 root cert. 
Now the authenticator finally works.
 2014-04-28 21:16:52 +02:00
Mattes D
709015369d Merge pull request #940 from Howaner/GlobalFixes 
Add entity invulnerable
 2014-04-28 20:58:15 +02:00
Howaner
26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new." 
This reverts commit d50f8f6f11.
 2014-04-28 13:51:22 +02:00
Mattes D
c063051645 Merge pull request #954 from mc-server/projectiles-split 
Totally refactored ProjectileEntity.h, splitting up into several files.
 2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
madmaxoft
dd52719c2d Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes. 2014-04-27 22:28:14 +02:00
madmaxoft
fdac27c63d Another attempt at #889. 
The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
 2014-04-27 17:31:58 +02:00
Mattes D
a0f6149d05 Merge pull request #948 from jfhumann/staticFixes 
Fixes motivated by Coverity #1
 2014-04-27 17:00:37 +02:00
archshift
e3c3795aa4 Moved cFireworkEntity out of ProjectileEntity.h 2014-04-26 17:50:05 -07:00
archshift
477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Howaner
d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00
Howaner
49f6819829 Fixes 2014-04-26 16:44:15 +02:00
jfhumann
f2b7cb138f Fixes resource leaks in the yggdrasil authenticator. (CID 43617) 2014-04-26 01:21:06 +02:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
madmaxoft
c4b4447a3a Authenticator uses some C++ SSL objects. 2014-04-24 21:53:41 +02:00
Mattes D
6492aa000b Merge pull request #909 from jfhumann/fixes 
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
 2014-04-22 13:34:32 +02:00
Mattes D
9f58046b5b Allow 1.6.4 Forge clients to log in. 
Fixes #913.
 2014-04-21 08:22:25 +02:00
jfhumann
fde1555352 Small style changes 2014-04-18 22:20:24 +02:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes 
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
 2014-04-18 21:44:58 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
daniel0916
b239de66db Merge branch 'master' into Enchanting 2014-04-18 15:04:32 +02:00
daniel0916
f9343a8490 Modified many things 2014-04-17 13:15:35 +02:00
madmaxoft
09866bb382 Added asserts for proper game state. 
This is to help hunt #889.
 2014-04-16 18:10:48 +02:00
daniel0916
5a9acb7eb6 Merge branch 'master' into Enchanting 2014-04-16 14:31:02 +02:00
madmaxoft
99e4225269 Attempted fix for the client crash with the new protocols. 2014-04-15 23:40:06 +02:00
madmaxoft
d12d7b6715 Implemented the 1.7.6 protocol and authenticator. 
Server works both in online and offline modes with 1.7.9.
 2014-04-14 22:52:59 +02:00
madmaxoft
d505ffc704 A client UUID is generated when the server is in offline mode. 
1.7.9 client works with these changes in offline mode.
 2014-04-14 20:21:00 +02:00
madmaxoft
ffe65b6a18 Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176 2014-04-14 18:53:56 +02:00
madmaxoft
0f55dcf036 Initial 1.7.6 protocol support. 
Doesn't work yet because of missing UUIDs.
 2014-04-14 18:52:21 +02:00
daniel0916
856e900bf8 Bug fixes 2014-04-14 11:48:12 +02:00
daniel0916
2618569e01 Fixed mistake 2014-04-13 17:09:18 +02:00
daniel0916
d258be678a Fixed Error? 2014-04-13 16:15:57 +02:00
daniel0916
3733ee2c0e Code Update 2014-04-13 15:32:15 +02:00
daniel0916
b506a74076 Added Yggdrasil Authentication System 
Code by Howaner.  Fixes/Changes by me.
 2014-04-13 13:04:56 +02:00
daniel0916
1dfd2b1c5f Fixed Errors 2014-04-07 20:25:30 +02:00
daniel0916
2e9754ac1c Merge remote-tracking branch 'upstream/master' into Enchanting 2014-04-07 20:12:17 +02:00
madmaxoft
95fb90eaa6 Fixed 1.6.4 client crash on composite chat messages. 2014-04-06 22:28:41 +02:00
madmaxoft
de3df0a71f Fixed crash in protocols sending 64-bit ints. 
Fixes #855.
 2014-04-06 22:15:49 +02:00
madmaxoft
87f39e9e28 Explicit change record size. 2014-04-04 13:19:25 +02:00
madmaxoft
bc227299d0 Fixed format string mismatch. 2014-04-04 12:08:14 +02:00
madmaxoft
4be894f060 More Clang warning fixes in the protocols. 2014-04-04 11:47:46 +02:00
madmaxoft
e1f75ab6d0 Fixed CreateHexDump's signedness. 2014-04-04 10:42:17 +02:00
madmaxoft
5dee19648d More Clang warning fixes in the protocols. 2014-04-04 10:31:50 +02:00
madmaxoft
8825d30aab Fixed some Clang warnings in protocols. 2014-04-04 10:13:25 +02:00
Mattes D
01c38505fd Merge pull request #831 from mc-server/Wither 
Wither
 2014-04-02 12:00:26 +02:00
madmaxoft
8126d9e66e Console logging supports cCompositeChat as its parameters. 2014-03-31 22:51:14 +02:00
andrew
0fe1e50ffc Protocol: Wither metadata 2014-03-25 10:32:58 +02:00
madmaxoft
b370cacf0c Plugins can set flying speed. 2014-03-20 16:14:40 +01:00
madmaxoft
64d9390069 Rewritten player speeds to be relative unit-less. 
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
 2014-03-20 15:45:42 +01:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
Tycho
f64f879027 Fixed format errors in protocol 2014-03-11 13:46:32 -07:00
Tycho
7c974b27b1 Removed unused macro 2014-03-10 10:49:03 -07:00
Tiger Wang
1985a9c33e Merge pull request #731 from mc-server/ballisticmissiles 
Ballistic firework missiles
 2014-03-09 21:43:15 +00:00
madmaxoft
b8cd0b0897 Hotfix for MSVC compilation. 2014-03-09 17:48:17 +01:00
Mattes D
d3c38c40e4 Merge pull request #777 from jfhumann/issue317 
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
 2014-03-09 15:13:27 +01:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
Jan-Fabian Humann
f74ee8fb51 Adjusted style of switch/case 2014-03-09 10:55:06 +01:00
Jan-Fabian Humann
72f9c8b069 Changed if-else to switch-case 2014-03-08 19:26:32 +01:00
Jan-Fabian Humann
66970fe943 Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. 2014-03-08 17:55:53 +01:00
Tycho
307fad0f25 Fixed issues with int vs size_t and a few other warnings 2014-03-08 08:33:38 -08:00
Tycho
d33d72f0dc Warnings 2014-03-07 11:04:25 -08:00
Howaner
787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
Tiger Wang
baf2d88921 Implemented ballistic missiles (fireworks) 
+ Added fireworks
 2014-02-26 23:33:52 +00:00
andrew
83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
Mattes D
87db4b6a90 Merge pull request #697 from Howaner/Skull 
Add Skulls/Heads to MCServer
 2014-02-19 22:12:38 +01:00
Howaner
d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
Howaner
823ee3a125 Add break to Protocol17x.cpp and use new comment delimiter 2014-02-19 14:12:34 +01:00
Tiger Wang
a686656253 Merge branch 'master' into itemframes 
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
 2014-02-18 22:13:44 +00:00
Tiger Wang
8b2153ba97 De-breaked stuff 2014-02-18 22:07:21 +00:00
andrew
393ca0221d Map decorators; Map clients 2014-02-18 20:50:08 +02:00
Tiger Wang
320cc74f0a Implemented paintings, fixes #689 
+ Implemented paintings
 2014-02-18 00:16:03 +00:00
Tiger Wang
464ec47eb7 Implemented item frames, a part of #689 
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
 2014-02-17 23:00:03 +00:00
Howaner
777041806f Add Skulls/Heads 2014-02-17 20:14:08 +01:00
Howaner
48d28a0f94 Add Locale to ClientHandle 2014-02-16 13:26:07 +01:00
Howaner
507a8a4b84 Set max. Players in the Tablist to 60 2014-02-16 01:18:57 +01:00
madmaxoft
0f1f7583ae Implemented cCompositeChat. 
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678.
 2014-02-15 23:17:49 +01:00
andrew
92e85cc960 Implementation of in-game maps 2014-02-13 17:13:09 +02:00
Tiger Wang
9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
 2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
madmaxoft
9e98c9691d Improved the signedness conversion. 2014-02-05 13:54:47 +01:00
Tiger Wang
630507fd5b Fixed a bunch of MSVS warnings 
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
 2014-02-04 23:07:22 +00:00
madmaxoft
91a8db0d7e Protocol 1.7: Fixed a signed / unsigned comparison warning. 2014-02-04 22:41:54 +01:00
madmaxoft
835a59b8fc Protocol 1.7 uses char for blockface. 
That should fix #644 on RasPi.
 2014-02-04 22:15:01 +01:00
Tycho
8464f689ea Improved Type safety of eBlockFace 
May Fix #640
 2014-02-04 10:59:05 -08:00
daniel0916
7735a1104f added EnchantItemPacket to older Protocols 2014-02-01 13:09:28 +01:00
daniel0916
36120db400 Some updates for enchanting (2) 2014-01-31 19:46:51 +01:00
madmaxoft
04107fa85d Limited sign lines to 15 chars. 
Fixes #598.
 2014-01-29 17:59:49 +01:00
madmaxoft
789cf63740 Added 1.7.4 to the list of supported protocols. 2014-01-29 12:16:27 +01:00
madmaxoft
3bbca8c291 Protocol 1.7: Encryption is enabled only with auth. 2014-01-29 09:56:31 +01:00
madmaxoft
bc6fc859f4 Protocol 1.7: Forced encryption on all connections. 
This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
 2014-01-28 23:53:54 +01:00
madmaxoft
30c431b479 Fixed client packet parsing. 
When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541.
Also modified comm logging, now each direction can be turned on separately.
 2014-01-26 17:56:12 +01:00
madmaxoft
a2dfb28537 Merged branch 'master' into ChangeToPolarSSL. 2014-01-25 15:37:00 +01:00
madmaxoft
ff066453b8 Comm logging is available in both Debug and Release modes. 2014-01-25 15:28:16 +01:00
madmaxoft
96b4af1596 Protocol17: Comm logging shows the data left over from previous parse. 2014-01-25 15:06:30 +01:00
madmaxoft
d0da5d392f Added per-connection comm logging in debug mode. 
It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter.
 2014-01-24 23:03:48 +01:00
daniel0916
5609fed360 removed hook from enchanting commit 2014-01-24 21:53:27 +01:00