1
0
Commit Graph

483 Commits

Author SHA1 Message Date
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
daniel0916
bfac00f280 Some updates for enchanting 2014-01-24 20:01:21 +01:00
madmaxoft
98976de071 Merge branch 'master' into ChangeToPolarSSL. 2014-01-23 23:46:51 +01:00
madmaxoft
5f34c78091 PolarSSL is fully used for 1.3.2 protocol encryption. 2014-01-23 23:35:23 +01:00
andrew
b21b682d85 Fixed 1.5.x scoreboard packet IDs 2014-01-23 21:06:05 +02:00
andrew
9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew
fa4750f015 Scoreboard SendTo() 2014-01-21 19:43:13 +02:00
andrew
aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
Alexander Harkness
9c93ab15ab Fix a crash but somewhere... 2014-01-20 19:02:37 +00:00
daniel0916
0c2b307eab first changes for enchanting (not finished)
- added enchanting table block handler and added it to the blockhandler
- added enchanting window
- drop item in the slot 0 when the player close the window
- added enchanting packet (1.7 only)
- some more...
2014-01-20 18:22:08 +01:00
Mattes D
865016abe2 Merge pull request #569 from worktycho/EnchantmentsFix
Enchantments fix
2014-01-19 13:50:50 -08:00
Tiger Wang
e4c3d799ff Removed unneeded paramters 2014-01-19 19:42:25 +00:00
Tycho
f13a14d2cf Switched EnchantmentSerilizer to namespace 2014-01-19 08:52:45 -08:00
Tycho
e14ddff1c0 Spilt Writing of Enchantments to seperate class
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
2014-01-19 07:38:59 -08:00
Tiger Wang
1af89a8b50 Changed SendBlockEntity format slightly
* Writing NBT is now in Protocol, not BlockEntity files
* Fixed a last output bug
2014-01-19 13:25:35 +00:00
Tiger Wang
f8c8dcc7f3 Improved command blocks
* 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
2014-01-19 00:54:38 +00:00
Mattes D
79c1f6f438 Merge pull request #534 from mc-server/SpawnMinecart
Added cWorld::SpawnMinecart.
2014-01-17 02:27:56 -08:00
madmaxoft
aec5200893 Removed internal cEntity::GetRot() usage. 2014-01-17 11:11:17 +01:00
madmaxoft
ed1d336614 Merge remote-tracking branch 'origin/customnames' 2014-01-17 10:44:23 +01:00
madmaxoft
3a1c0f2aef Protocol 1.7: More output on unknown packets / protocol states. 2014-01-17 10:12:27 +01:00
Tiger Wang
7ecf50c309 Fixed block break packet number 2014-01-16 22:42:47 +00:00
Tiger Wang
d675173b80 Changed newline character because of issues 2014-01-16 22:30:57 +00:00
madmaxoft
a085319455 Protocol 1.7: Unknown packets are dumped to log in Debug mode. 2014-01-16 20:39:59 +01:00
Tiger Wang
74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
Tiger Wang
3373daca26 Merge remote-tracking branch 'origin/master' into customnames 2014-01-16 18:37:46 +00:00
madmaxoft
e29749b35e Added packet diagnostics to 1.7 protocol.
When the packet is mis-interpreted, a log message is output about the packet type and lengths.
2014-01-16 15:26:58 +01:00
Tiger Wang
fcafd5a2e0 Implemented custom names and lore
+ Added custom names and lore
+ Added saving and loading
+ Added writing and parsing of NBT
2014-01-15 22:38:03 +00:00
madmaxoft
ada54b79d7 Added handshake processing to protocol 1.7.
This fixes #495
2014-01-13 20:32:15 +01:00
STRWarrior
f11427e8cd Renamed cEmptyMinecart to cRideableMinecart 2014-01-12 18:04:41 +01:00
STRWarrior
c5603ce064 EmptyMinecarts should be able to get a block inside of them. 2014-01-12 15:27:50 +01:00
madmaxoft
f3bedb3c32 Fixed wrong packet number for PluginMessage packet. 2014-01-09 14:24:57 +01:00
madmaxoft
fe978f0d1e Added cClientHandle::SendPluginMessage().
It is not yet exported in the API, though.
2014-01-09 11:39:42 +01:00
Alexander Harkness
01fcf2fecb Merge pull request #516 from mc-server/favicon
Fixed favicons
2014-01-07 09:09:57 -08:00
Tiger Wang
1d96a615b5 Fixed favicons 2014-01-07 16:53:40 +00:00
madmaxoft
e353f29d4a Plugin messages are received and handed to plugins.
Note that MCS doesn't currently handle any channel registrations, this will come later on.
2014-01-07 17:47:20 +01:00
Mattes D
a87daa969e Merge pull request #514 from derouinw/master
Implement favicon for 1.7.2
2014-01-07 08:41:13 -08:00
Bill Derouin
1c2eb4a1c0 A few more touch ups 2014-01-07 09:49:52 -06:00
Bill Derouin
5fd62f9cd7 Removed unused line 2014-01-07 09:38:51 -06:00
Bill Derouin
913841f501 Implement favicon for 1.7.2
Favicon data is a png encoded in base64 which is stored in the server
and sent in the server response packet
2014-01-07 09:31:06 -06:00
madmaxoft
934b90c121 Fixed a few MSVC warnings. 2014-01-07 14:24:25 +01:00
madmaxoft
9c8af58b75 Fixed a few MSVC warnings. 2014-01-06 22:22:33 +01:00
Diusrex
2dbe5033ca Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h
I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings.

So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function.
2014-01-05 15:06:17 -07:00
madmaxoft
15dddc7701 More memory alignment fixes.
Ref.: #420.
2014-01-02 18:08:38 +01:00
STRWarrior
e9d1352f6e Implented BroadcastParticleEffect 2013-12-22 14:45:25 +01:00
Tycho Bickerstaff
779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
madmaxoft
eabb88eb74 Fixed minor warnings. 2013-12-20 16:22:16 +01:00
Tiger Wang
03a8dfc4a8 Fixed PlayerAbilities and creative 2013-12-19 20:53:47 +00:00
Tycho Bickerstaff
0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +00:00
Tycho Bickerstaff
0a96bf1c03 moved protocol to glob 2013-12-19 00:11:04 +00:00
Tycho Bickerstaff
e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00:00
madmaxoft
f8f4ab88f6 Fixed player falling through the floor on spawn.
The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem.
2013-12-17 20:16:06 +01:00
madmaxoft
c33c8882b3 Fixed player spawning packet.
The player was spawned 1.62 blocks below their pos. This fixes #323.
2013-12-15 20:50:07 +01:00
STRWarrior
ffb5a69a9e Moved reading flags to the protocol. 2013-12-15 15:11:59 +01:00
STRWarrior
b10d0b95cb Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function 2013-12-15 14:48:17 +01:00
STRWarrior
828cca5c7e Fixed pre 1.7 clients crashing. 2013-12-15 11:34:00 +01:00
Mattes D
5e6a4c99a7 Merge pull request #431 from mc-server/Entity_Effects
Entity Effects
2013-12-14 14:40:24 -08:00
madmaxoft
322382e379 Removed leftover debugging messages from cProtocol172. 2013-12-14 23:34:56 +01:00
STRWarrior
37069288d5 Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. 2013-12-14 18:03:00 +01:00
madmaxoft
33c6bcc2f4 Fixed threading issues affecting cProtocol172. 2013-12-13 17:53:26 +01:00
madmaxoft
f3c9ea0ed2 Fixed protocol 1.7 recovery after unknown packet. 2013-12-12 23:05:02 +01:00
Tycho Bickerstaff
dd633d5a94 Merge branch 'master' into cmake 2013-12-10 23:01:35 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
Tiger Wang
f64dd786aa Fixed tabcompletion packet, fixes #356 2013-12-08 13:37:10 +00:00
Tiger Wang
0148685d4e Fixed falling block metas, fixes #406 2013-12-08 00:32:02 +00:00
Tiger Wang
30ead79049 Renamed animation function
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
Samuel Barney
53d5eb09e0 Removed stray printf, again. 2013-12-02 09:56:42 -07:00
Samuel Barney
050702eaa1 Switched to using provided ReadItem function.
Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
2013-12-02 09:32:28 -07:00
Samuel Barney
9e75df6a41 Removed stray printf. 2013-12-02 00:51:39 -07:00
Samuel Barney
458eff560b Fixed 1.7 slab and stair placement. 2013-12-01 20:40:12 -07:00
Alexander Harkness
d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Alexander Harkness
3b790bbf67 Fixed some of tiger's derpyness. 2013-11-27 07:27:19 +00:00
Alexander Harkness
0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	VC2008/MCServer.vcproj
2013-11-26 17:21:06 +00:00
Tiger Wang
32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang
e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness
c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00