1
0
Commit Graph

7264 Commits

Author SHA1 Message Date
Alexander Harkness
9dccbe7792 Fixed line left in. 2014-09-27 15:40:33 +01:00
Alexander Harkness
3ff7103440 Remaining part of fix. 2014-09-27 15:35:06 +01:00
Alexander Harkness
400a4d1083 Hopefully fix #1384
Can @madmaxoft comment?
2014-09-27 15:33:35 +01:00
worktycho
c40f65ad83 Update creatable.cpp 2014-09-27 15:29:11 +01:00
worktycho
cc73b70211 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:24:01 +01:00
worktycho
88a07bd184 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:19:32 +01:00
worktycho
20101fab99 Correct method name. 2014-09-27 15:04:08 +01:00
worktycho
94a0d04d58 Set chunk data 2014-09-27 14:49:03 +01:00
worktycho
4f8818748e Add data accessor. 2014-09-27 14:46:50 +01:00
Tiger Wang
72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Alexander Harkness
4df56fde88 Merge pull request #1459 from Masy98/blocks
Fixed drops for Doors and Fence Gates
2014-09-27 14:17:13 +01:00
Masy98
6dd47e783a Added default value to switch and spruce gate to fence gate handler 2014-09-27 15:11:35 +02:00
Masy98
485bac2818 Fixed convertToPickups for fence gates 2014-09-27 14:23:58 +02:00
Masy98
30f9a4d3ab Fixed convertToPickups for doors 2014-09-27 14:19:45 +02:00
Alexander Harkness
ad42adb5fa Removed polarSSL makefile. Fixes #591.
Also normalises polarssl submodule URL.
2014-09-27 12:04:54 +01:00
Mattes D
305778f22f Merge pull request #1456 from Howaner/Fixes
Fixed player custom names in 1.8 and added type checking to map loading
2014-09-26 23:01:22 +02:00
madmaxoft
0d83477540 Fixed UNUSED macro so that it doesn't require type knowledge.
Introduced new UNUSED_VAR macro that is used when type knowledge is available (for local variables).
2014-09-26 22:53:39 +02:00
Tiger Wang
a817243e3f Updated Core 2014-09-26 21:42:55 +01:00
Mattes D
2c5b0f2378 Merge pull request #1415 from Masy98/blocks
Added 1.8 Blocks and Items
2014-09-26 22:24:45 +02:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Tiger Wang
4e2b838a69 Merge pull request #1455 from mc-server/includes
Removed a few unnecessary includes
2014-09-26 19:46:43 +01:00
worktycho
02db79d725 Update Plugin.h 2014-09-26 19:00:26 +01:00
Masy98
9106a8c29b Moved curly brace to seperate line 2014-09-26 19:45:03 +02:00
Masy98
4105be0bec Re-added 1.8 blocks to the redstone simulator 2014-09-26 19:44:06 +02:00
Tycho
0e141923bb Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-26 18:14:22 +01:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-26 18:32:31 +02:00
tycho
ad5d0eda9c Fixed issue with casting 2014-09-26 17:00:34 +01:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
Tycho
6ffb7835e7 Removed a few unnessicary includes 2014-09-26 16:26:03 +01:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
Howaner
749c6092d3 Added type checking to map loading. 2014-09-26 14:31:52 +02:00
madmaxoft
157cad9007 Improved searching for spawn.
Won't spawn on a small island inside ocean anymore.
2014-09-26 13:04:34 +02:00
madmaxoft
6b260f06ba cByteBuffer: Simplified ReadPosition().
Also, by popular demand, added more comments to the code.
2014-09-25 23:06:21 +02:00
madmaxoft
976c6bd32b Protocol 1.8: Fixed plugin message packet. 2014-09-25 21:33:20 +02:00
madmaxoft
0443f5d531 cByteBuffer: Fixed position reading. 2014-09-25 21:23:05 +02:00
madmaxoft
e5293706de TwoLevel BioGen: reads params from INI file. 2014-09-25 20:47:29 +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
050b28741b Comment style 2014-09-25 19:28:11 +02:00
Howaner
dd423a2467 Merge branch 'master' into Fixes 2014-09-25 19:22:46 +02:00
Howaner
060ac500fc Fixed wrong Surrounding size 2014-09-25 19:19:30 +02:00
Howaner
7cdcf0a883 Anvil: Arrow Tile tags are a short in Vanilla 2014-09-25 19:01:44 +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
Howaner
67fe834499 Fixed dispender direction bug 2014-09-25 18:37:36 +02:00
Howaner
daf5127b28 Fixed hanging direction bugs. 2014-09-25 18:37:24 +02:00
madmaxoft
c6f78d516b Redstone: Fixed a crash with repeaters on a chunk border. 2014-09-25 18:36:11 +02:00