1
0
Commit Graph

361 Commits

Author SHA1 Message Date
Mattes D
190d34e2f7 Merge pull request #1565 from mc-server/MergedIniFile
Merged ini file
2014-10-24 09:13:39 +02:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Howaner
72bb299a4a Merge branch 'master' into ChunkLoader
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
2014-10-23 14:59:42 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D
a42fa071bc Properly exported cItemFrame and cHangingEntity to Lua. 2014-10-21 22:02:30 +02:00
Howaner
44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang
2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Mattes D
687752241f cMojangAPI: Don't update data if server is in offline mode. 2014-10-17 13:57:18 +02:00
Howaner
a59f2d15fb Merge branch 'master' into ChunkLoader 2014-10-06 17:38:42 +02:00
Mattes D
3d2d8a096b cMojangAPI: Added periodical refreshes. 2014-10-06 10:05:02 +02:00
Mattes D
a8aeceab9d cClientHandle: Added protocol version knowledge. 2014-10-05 20:19:21 +02:00
Tiger Wang
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
Howaner
382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
madmaxoft
e74510bddf Fixed a missing semicolon. 2014-09-30 20:27:20 +02:00
madmaxoft
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
madmaxoft
aae90c2cf0 Style fixes. 2014-09-29 21:38:11 +02:00
madmaxoft
280831df26 Plugin messages: Vanilla prefixes its payloads with VarInt lengths. 2014-09-28 23:03:44 +02:00
madmaxoft
488c6159df Revert "1.8: Fixed plugin messages."
This reverts commit 04ee8c43dd.
2014-09-28 22:27:23 +02:00
madmaxoft
f8c627141a Protocol 1.8: Fixed possible crash on malformed packet. 2014-09-28 22:25:48 +02:00
Mattes D
8d55cd409e Merge pull request #1466 from mc-server/endofsupport
Removed protocols 1.2 to 1.6
2014-09-28 22:04:30 +02:00
Tiger Wang
ae36ba5d33 Compilation fix 2014-09-28 13:08:00 +01:00
Howaner
04ee8c43dd 1.8: Fixed plugin messages. 2014-09-27 23:22:26 +02:00
Tiger Wang
1f8ee70d55 Bug fix 2014-09-27 22:13:37 +01:00
Tiger Wang
72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
madmaxoft
976c6bd32b Protocol 1.8: Fixed plugin message packet. 2014-09-25 21:33:20 +02:00
madmaxoft
8f4cc27e39 Added cByteBuffer::WriteBEUShort(). 2014-09-25 20:47:29 +02:00
Mattes D
e751f4ffe3 Merge pull request #1452 from Howaner/Fixes
Fixes
2014-09-25 20:45:54 +02:00
madmaxoft
27187371eb Protocol 1.8: Handling packet compression properly.
The compression didn't work with CommLog turned on.
2014-09-25 20:34:49 +02:00
madmaxoft
3459bc1ede Protocol 1.8: Added checks for values presence.
Reported by @worktycho / Coverity.
2014-09-25 19:42:35 +02:00
Howaner
dd423a2467 Merge branch 'master' into Fixes 2014-09-25 19:22:46 +02:00
Tycho
b2f5ab9678 Merge branch 'master' into redstoneTests
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-25 17:58:12 +01:00
Howaner
12621e3800 Use the json writer to write sign texts.
Without this change the client disconnects if the text contains "
2014-09-25 18:49:55 +02:00
madmaxoft
aeabc4ff6b 1.8 Protocol: Fixed problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft
a518a83c25 1.7 Protocol: fixed potential problems with no-payload packets. 2014-09-25 18:36:10 +02:00
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
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