1
0

3239 Commits

Author SHA1 Message Date
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
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
0beed83ae9 Rewrited furnace.txt loading. 2014-08-31 19:00:36 +02:00
Howaner
e67bb7f431 WebAdmin: Stop webadmin if template can't load. 2014-08-31 15:03:23 +02:00
Howaner
7e5f22141f WebAdmin: Added "files" folder and load the login template from login_template.html 2014-08-31 12:59:04 +02:00
Jaume Aloy
6180f7df09 Fixed style 2014-08-31 11:28:42 +02:00
worktycho
365d2447d0 Check range of y in HasNearLog
Fixes #803
2014-08-31 00:15:48 +01: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
Howaner
3ee3a59e75 Changed the IsEnchantable() comment. 2014-08-30 15:06:43 +02:00
Howaner
0fdb177208 Fixed potion removing in creative mode. 2014-08-30 12:46:26 +02:00
Howaner
003206b1b0 Added slowness effect and added entity support. 2014-08-30 12:45:39 +02:00
Howaner
d7ee2245e8 Added SetWalkSpeed() to cMonster. 2014-08-30 12:44:54 +02:00
Howaner
80bd0a5457 Merge branch 'master' into Effects 2014-08-30 12:21:39 +02:00
LO1ZB
ac95173e81 remove orphaned comment. 2014-08-30 00:45:05 +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
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
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
240ec9b4bd Added speed entity effect. 2014-08-28 23:02:20 +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