1
0
Fork 0
Commit Graph

235 Commits

Author SHA1 Message Date
Tycho 6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tycho 26a4845a99 IncrementalRedstoneSimulator now has no dependencies on cChunk 2014-09-16 20:29:31 +01:00
Tycho 0b044e1c83 Possibly decoupled IncrementalRedstoneSimulator from the rest of the server
THis wil hopefully allow for unit testing
2014-09-11 17:48:21 +01:00
worktycho 1f0b6eeaf3 Actually set default 2014-09-09 12:18:20 +01: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
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
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
madmaxoft 3297a39c27 Merge remote-tracking branch 'origin/master' into EntitiesInBox 2014-09-04 14:02:18 +02:00
Mattes D c140ba2367 Merge pull request #1351 from LO1ZB/remove-a_RelY
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
madmaxoft a51c1e0b73 Added cWorld::ForEachEntityInBox() 2014-09-03 17:00:26 +02:00
LO1ZB a600e3bdfe hopefully the last commit for removing y-coord from chunks. :) 2014-09-03 00:14:51 +02:00
madmaxoft 26b8471280 Merge branch 'master' into fixes 2014-08-30 22:17:49 +02:00
LO1ZB 5a6ef8b8e5 me being stupid 2014-08-29 20:27:58 +02:00
LO1ZB e45a27add9 add comments 2014-08-29 20:26:19 +02:00
LO1ZB 75e1316386 fix chunk regenerating 2014-08-29 20:19:45 +02:00
Mattes D 22e3bbd0db Rewritten block entity loading.
Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked.
The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't.
Fixes #1354.
2014-08-29 19:19:47 +03:00
Tiger Wang 431b7ed0b7 Merge branch 'master' of https://github.com/mc-server/MCServer
Conflicts:
	src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang 21ff1d81ab Improved explosion damage 2014-08-29 13:44:10 +01:00
LO1ZB 3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Mattes D d2d63b8a05 World: Report chunk count for the spawn area. 2014-08-22 10:35:51 +02:00
Mattes D 81d238e080 Added cWorld initializers. 2014-08-21 21:53:25 +02:00
Howaner b5ffe06f88 Code formatting fixes. 2014-08-19 22:14:37 +02:00
madmaxoft 008c1cdaf4 CheckBasicStyle checks the src folder as well. 2014-08-14 01:03:30 +02:00
Howaner 47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
Howaner 42bad0edec Added a comment and simplified code. 2014-08-10 20:06:03 +02:00
Howaner f90078c09f Added IsDaylightCycleEnabled saving. 2014-08-10 16:48:20 +02:00
Howaner cccc321384 Renamed functions. 2014-08-10 16:46:03 +02:00
Howaner 32e1e9a553 Renamed m_DoDaylightCycle to m_CycleDaylight. 2014-08-08 22:07:30 +02:00
Howaner 4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
Tiger Wang b5c0a4aa3a Fixed issues with autocomplete and time loading
* Fixes #1274
2014-08-01 22:15:34 +01:00
Mattes D 35cfbfd51a Merge pull request #1269 from Howaner/BlockEntitys
Added beacon.
2014-08-01 17:43:02 +02:00
Howaner cfaef0de38 Capitalised "incremental" 2014-07-31 23:11:51 +02:00
Howaner f47765dcbd Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. 2014-07-31 18:21:45 +02:00
Howaner 81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
madmaxoft f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Tiger Wang 4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
Howaner a5cca16abe Add "Broadcasting" settings to world.ini 2014-07-27 00:39:39 +02:00
madmaxoft c0b62ef139 Added a queue for setting chunk data.
Fixes #1196.
2014-07-24 18:32:05 +02:00
STRWarrior 9678341a11 Made the cWorld::SpawnMobFinalize function more readable. 2014-07-24 12:15:48 +02:00
Tiger Wang 1156914dd6 Suggestions 2014-07-23 21:12:59 +01:00
Tiger Wang a28b0dc120 Speed improvements, crash fixes, & self-suggestions 2014-07-22 17:26:48 +01:00
Tiger Wang 0a15e1f420 Suggestion and failed merge fix 2014-07-22 10:33:16 +01: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
Tiger Wang 8050a5b98a Suggestions 2014-07-21 22:49:06 +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
Tiger Wang 6ab9afd0fd Bug and crash fixes
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00