madmaxoft
7d8a474f13
Fixed MSVC compilation, improved performance.
...
We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
2014-09-01 14:31:05 +02:00
madmaxoft
f22f67a63c
Fixed MSVC warning.
2014-09-01 14:29:13 +02:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
madmaxoft
ea39c1d21c
Avoid false positive in style check.
2014-09-01 13:43:10 +02:00
Mattes D
74204aed6c
Merge pull request #1365 from mc-server/coverityFixes
...
Coverity fixes
2014-09-01 13:41:20 +02:00
madmaxoft
1e60265a90
Fixed style.
2014-09-01 13:33:17 +02:00
Mattes D
78b7d0006a
Merge pull request #1363 from mc-server/FurnaceRecipes
...
Rewritten furnace.txt loading
2014-09-01 09:00:51 +02:00
Howaner
959f89f5bc
Fixed ReplaceString() documentation.
2014-09-01 00:42:40 +02:00
worktycho
468c2558d6
Removed isDone check
...
The same data is returned by executeStep so why execute a call when you have the data.
2014-08-31 21:26:02 +01:00
worktycho
361b7d5379
Changed null check to assert
...
Changed the null check to clarify that the function should not be called before the entity has been attached to a world.
2014-08-31 21:14:42 +01:00
Howaner
af125d2a61
Use std::auto_ptr
2014-08-31 22:04:52 +02:00
worktycho
3e7332c70c
Delete the entity before removing from the list
...
Old code was calling dereference on invalid iterator
2014-08-31 20:28:41 +01:00
worktycho
b6d77d9679
Init RankMgr pointer to NULL
2014-08-31 20:26:08 +01:00
Howaner
0d392f53ed
Fixed compile warnings.
2014-08-31 20:53:41 +02:00
Howaner
66417f7a48
Fixed wrong doxy-comment.
2014-08-31 19:29:54 +02:00
Howaner
3d7b8d3598
Rewrited furnace.txt
2014-08-31 19:28:36 +02:00
Howaner
0beed83ae9
Rewrited furnace.txt loading.
2014-08-31 19:00:36 +02:00
Jaume Aloy
6180f7df09
Fixed style
2014-08-31 11:28:42 +02:00
Mattes D
e9f9539310
Merge pull request #1357 from mc-server/leafFix
...
Check range of y in HasNearLog
2014-08-31 12:27:56 +03:00
worktycho
365d2447d0
Check range of y in HasNearLog
...
Fixes #803
2014-08-31 00:15:48 +01:00
STRWarrior
9f321e29cf
Merge pull request #1355 from mc-server/fixes
...
Fixes
2014-08-30 22:42:38 +02:00
madmaxoft
db663c7ee1
Fixed style.
2014-08-30 22:24:04 +02:00
madmaxoft
26b8471280
Merge branch 'master' into fixes
2014-08-30 22:17:49 +02:00
madmaxoft
fc7da22738
WSSAnvil: Removed leftover debugging code.
2014-08-30 22:11:52 +02:00
madmaxoft
b0a7d93ae1
Fixed MSVC2008 compilation.
...
It was getting confused about which sqrt() overload to call.
2014-08-30 22:11:09 +02:00
Mattes D
a4778b6e33
Merge pull request #1340 from Masy98/crafting
...
Added missing recipes for stairs and slabs
2014-08-30 22:54:48 +03:00
Masy98
55907376d5
Fixed missing slab name in line 297
2014-08-30 21:36:20 +02:00
Masy98
2d5a38bd61
Merge branch 'master' into crafting
2014-08-30 21:31:51 +02:00
Jaume Aloy
4900645b28
Added a_Digger check
2014-08-30 00:27:33 +02:00
Mattes D
a2bee74a13
cChunk: Fixed the Coords param.
2014-08-29 23:21:58 +03: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
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
