1
0
Commit Graph

6915 Commits

Author SHA1 Message Date
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
9c1fadd50c Updated Core 2014-08-29 15:13:47 +01:00
Tiger Wang
389614c959 A better hotfix for CraftingRecipies 2014-08-29 15:12:45 +01: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
618741f78e Added new console command with cleanup 2014-08-29 14:43:49 +01:00
Tiger Wang
21ff1d81ab Improved explosion damage 2014-08-29 13:44:10 +01:00
Tiger Wang
114b14faad Removed unused code 2014-08-29 13:44:01 +01:00
Tiger Wang
fca5a01145 Improved command block security 2014-08-29 13:41:50 +01:00
Mattes D
d0551e2e0a VanillaFluidSimulator: Fixed an invalid Y-coord query.
This was causing a spam of console messages, along with possible server crash, when liquids passed below the world: http://forum.mc-server.org/showthread.php?tid=1508&pid=15632#pid15632
2014-08-29 14:58:41 +03:00
Mattes D
97c4c057e4 Fixed conversion warning. 2014-08-29 11:20:33 +03:00
Mattes D
42570cbeef Fixed spaces. 2014-08-29 11:20:23 +03:00
Hownaer
c4d7f7996b Hotfixed recipe.txt loading. 2014-08-29 00:42:33 +02:00
Hownaer
4470ebffd7 Fire can be destroyed with the sword in creative-mode 2014-08-28 20:49:34 +02:00
Hownaer
c2260addf4 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-28 18:58:58 +02:00
Hownaer
eaf33e22cf Fixed anvil placing. 2014-08-28 18:57:56 +02:00
Hownaer
4ff34b9f10 APIDump: Added missing cItem things. 2014-08-28 18:18:21 +02:00
Mattes D
e931b649ac Merge pull request #1323 from mc-server/CraftingFixes
Fixed a couple of issues in craftingRecipes.cpp
2014-08-28 17:35:56 +03:00
Mattes D
1c136a6047 Fixed a typo. 2014-08-28 17:04:26 +03:00
Mattes D
d74e49ddc0 Final template keyword style fix. 2014-08-28 17:01:59 +03:00
Mattes D
0cc824d414 Merge pull request #1324 from ChriPiv/master
Implement ability to push minecarts on curved rails
2014-08-28 17:01:23 +03:00
Mattes D
271c8c0d32 More template keyword fixes. 2014-08-28 16:58:48 +03:00
Mattes D
52a6b30f32 Merge remote-tracking branch 'origin/master' into CraftingFixes 2014-08-28 16:53:36 +03:00
Mattes D
9b68ff2656 CheckBasicStyle: Added checking for the "template" keyword. 2014-08-28 16:53:26 +03:00
Mattes D
49ac6fadfc Fixed spaces after "template" keyword. 2014-08-28 16:44:36 +03:00
Hownaer
c0c4ac5236 Added comments. 2014-08-28 15:21:50 +02:00
Hownaer
f1470fcf9f Fixed bad values in the IsEnchantable() method. 2014-08-28 15:21:38 +02:00
Hownaer
6c3b80f04c Fixed crashes and use std::swap. 2014-08-28 14:58:03 +02:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Hownaer
0f1fd33123 Enchanting table improvements. 2014-08-28 01:21:54 +02:00
Hownaer
e555cb4ab3 Fixed ItemCategory code example. 2014-08-28 00:05:11 +02:00
reiter
690e6cb6f8 Fixed mob burning.
Fixes #1298
2014-08-28 00:01:01 +02:00
Mattes D
e54c78923e DungeonRooms: Fixed an off-by-one error. 2014-08-27 20:55:28 +03:00
Mattes D
fe3d8fd810 Debuggers: Added a testcase for OnProjectileHitBlock.
This is a test for #1326.
2014-08-27 15:41:29 +03:00
Mattes D
e54a7dc6c4 More basic style fixes. 2014-08-27 15:21:20 +03:00
Mattes D
d8527c5429 Fixed basic style violations. 2014-08-27 15:13:13 +03:00
Mattes D
bc44b96059 CheckBasicStyle: Relaxed the "space after comma".
An apostrophe directly following a comma is not a violation.
2014-08-27 15:12:49 +03:00
Mattes D
4a907c9efa Merge pull request #1345 from mc-server/DungeonRoomsFinisher
Added dungeon rooms finisher.
2014-08-27 14:53:02 +03:00
Mattes D
62e1c45ca5 DungeonRooms: Added a height probability distribution function. 2014-08-27 13:25:27 +03:00
Mattes D
3da27fb7a3 Merge pull request #1346 from mc-server/AnvilStatsHeights
Anvil stats heights
2014-08-27 12:32:51 +03:00
Mattes D
cde195c156 AnvilStats: Fixed thread start race condition.
The whole program would sometimes fail to process anything because the threads were waited-for before they were started.
2014-08-27 12:29:57 +03:00
Mattes D
af47b5ece2 AnvilStats: Added per-height spawner stats. 2014-08-27 12:24:56 +03:00
Mattes D
751d345c59 AnvilStats: Ignoring output XLS files. 2014-08-27 11:54:22 +03:00
Mattes D
b361e994ef AnvilStats: Added cmake directive for larger executable stack.
This fixes runtime "stack overflow" errors caused by large stack-allocated arrays used for decompression.
2014-08-27 11:53:46 +03:00
Mattes D
ccaa51f913 AnvilStats: Fixed Win64 compilation. 2014-08-27 11:52:54 +03:00
madmaxoft
d783753cb5 AnvilStats: initial per-height blocktype implementation (WIP). 2014-08-27 09:46:59 +02:00
madmaxoft
24a092d9cb AnvilStats: Rewritten to use CMake. 2014-08-27 09:05:43 +02:00
Mattes D
c6beb9760b DungeonRooms: Added the spawner in the center of the room. 2014-08-27 08:12:26 +03:00
Mattes D
0c3c136c72 DungeonRooms: Chests are never placed next to each other. 2014-08-26 17:46:14 +03:00
Mattes D
a40f358064 DungeonRooms: Random pattern for floors. 2014-08-26 17:25:38 +03:00