1
0
Commit Graph

7242 Commits

Author SHA1 Message Date
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
worktycho
bd810b80a6 use the correct ASSERT 2014-09-08 21:31:47 +01:00
Tycho
fb20c2eb85 FIxed a couple more warnings 2014-09-08 19:15:29 +01:00
Howaner
76fa3a7ccd More fixes. 2014-09-08 20:12:43 +02:00
Tycho
2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
Tycho
4bdf9256f2 Fixed a few compile warnings 2014-09-08 18:56:27 +01:00
Howaner
e740739d04 Recoded cProtocol180 class. 2014-09-08 19:24:33 +02:00
worktycho
64071aeda9 capitalisation error 2014-09-08 17:45:23 +01: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
Mattes D
9e36bbd069 Merge pull request #1397 from mc-server/saveSetting
If server fails init, save any changed or generated settings.
2014-09-08 16:31:44 +02:00
worktycho
4613fabd45 derp 2014-09-08 15:15:31 +01:00
worktycho
5f207c8bb7 If server fails init, save any changed or generated settings. 2014-09-08 14:57:58 +01: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
c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D
d2c1518145 Webadmin: Added default ports to auto-generated ini file.
Fixes #1382.
2014-09-07 19:45:15 +02:00
Mattes D
a0feff2734 WebAdmin: Added HTTPS instructions when cert / key is missing. 2014-09-07 19:42:35 +02:00
Mattes D
690867c89e Fixed submodules' downgrade from the previous PR merge. 2014-09-07 09:09:10 +02:00
Masy98
a2452ff6fa Re-ordered the items.ini and added a few new names 2014-09-06 22:37:48 +02:00
Masy98
9cdb9b6262 Merge branch 'master' into blocks
Conflicts:
	MCServer/crafting.txt
2014-09-06 22:06:40 +02:00
Masy98
029eb3d4fa Merge remote-tracking branch 'upstream/master' 2014-09-06 22:03:35 +02:00
Mattes D
c71a37012c Merge pull request #1385 from mc-server/clangWarnings
Should now compile in clang 3.0
2014-09-06 20:35:51 +02:00
worktycho
22b4511640 Update SetFlags.cmake 2014-09-06 18:11:42 +01:00
Mattes D
52dd5ba6dd Added missing newline. 2014-09-06 19:02:16 +02:00
Mattes D
e1a9a6291b Removed chunk's unused Y coord.
This fixes the second issue of #1313.
2014-09-06 19:01: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
Tycho
562b2d1d1d Added workaround for clang version 2014-09-06 16:30:04 +01:00
Tycho
5fa206a420 bumped cmake version min and fixed clang support 2014-09-06 15:30:13 +01:00
worktycho
f7d06f093e Wrong cmake var 2014-09-06 14:55:06 +01:00
worktycho
8b5ad667d9 Improve error message 2014-09-06 14:49:40 +01:00
worktycho
f22b9aa5f4 Should now compile in clang 3.0 2014-09-06 14:38:47 +01:00
Mattes D
9e1f67932b Fixed player spawning in unknown world.
This may happen if the admin removes a world.
2014-09-06 15:26:20 +02:00
madmaxoft
29910bc3bd Win build: put third party licenses into a separate folder. 2014-09-06 13:41:23 +02:00
Mattes D
9f9302f470 Anvil: Fixed an off-by-one error in the loader.
Fixes #1307.
2014-09-06 13:32:16 +02:00
Mattes D
dd0aa22d2e Fixed scoreboard loader type checks.
Fixes scoreboard loading error reported on the Dropper map in #1307.
2014-09-06 13:11:08 +02:00
Alexander Harkness
f6e029253f Removed outdated message sending methods.
Fixes #1381
2014-09-06 10:24:33 +01:00
Mattes D
b1cc1451d4 Merge pull request #1361 from mc-server/WebAdmin
Webadmin improvements
2014-09-06 11:12:18 +02:00
Alexander Harkness
15d4e543b1 Xoft fixes. 2014-09-06 09:56:22 +01:00
Mattes D
103fa8812d WorldStorage no longer queues chunks into generator. 2014-09-05 23:26:00 +02:00
Mattes D
4230eb3d92 Fixed loading empty chunks.
Reported on the Dropper map in #1307.
2014-09-05 22:55:39 +02:00
Mattes D
137b021d26 Rewritten chunk status to specify whether the chunk is in queue.
This fixes #1370.
2014-09-05 22:16:48 +02:00
Mattes D
e15b8600a6 BiomeMultiCache is not used for simple generators. 2014-09-05 22:08:00 +02:00
Mattes D
60e235362c Fixed style. 2014-09-05 22:07:13 +02:00
Mattes D
6444bc25ba Fixed security: Player cannot spawn in a disabled world. 2014-09-05 16:55:16 +02:00
Mattes D
254c8c9154 Anvil: Fixed loading block entities with invalid Y coord. 2014-09-05 16:40:03 +03:00