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
44c1d9c248
Anvil: switched inflate to stream mode.
...
This removes the fixed-size buffer which could have caused #1307 and #1366 .
2014-09-03 19:36:53 +02:00
LO1ZB
42fb71f261
commit
2014-09-03 13:52:32 +02:00
madmaxoft
1cc65b6264
Fixed style and alpha-sorting.
2014-09-03 10:29:10 +02:00
archshift
34d6f0713e
Added mutton, which sheep now drop when killed
2014-09-02 23:21:08 -07:00
archshift
b414e91883
EntityEffect.cpp: Enable 1.8's leaping potion
2014-09-02 22:56:39 -07:00
LO1ZB
554f585017
re-add the missing "s" too cChunkCoordsWithBoolList
2014-09-03 00:28:08 +02:00
LO1ZB
a600e3bdfe
hopefully the last commit for removing y-coord from chunks. :)
2014-09-03 00:14:51 +02:00
madmaxoft
a0687b42e4
Clang wants volatile...
2014-09-02 23:05:24 +02:00
madmaxoft
92a60bf4d5
Added strict error reporting to chunk loading.
...
This should help with #1307 .
2014-09-02 22:41:02 +02:00
Howaner
c19b2befa8
Changed the IsEnchantable() comment again.
2014-09-02 20:17:31 +02:00
Howaner
e431bb4e63
Merge branch 'master' into Inventory
2014-09-02 20:11:38 +02:00
madmaxoft
b1da567f3d
Pickups combine only within one chunk.
...
This greatly improves performance of the tick thread.
2014-09-01 21:43:03 +02:00
madmaxoft
6f18d01b51
Fixed off-by-one errors in cChunkDef asserts.
2014-09-01 21:17:22 +02:00
Mattes D
3093f3d180
Merge pull request #1368 from mc-server/coverityFixes
...
Make sure packets are valid
2014-09-01 20:57:55 +02:00
worktycho
de30a8c8c6
Make sure packets are valid
...
Fixes CID 66408, 66409 and 72045
2014-09-01 18:18:07 +01:00
madmaxoft
022f5f141d
Fixed Bindings regeneration under MSVC.
2014-09-01 16:10:40 +02:00
LO1ZB
4c9abab2d1
fix possibility of a twice generated chunk
2014-09-01 15:01:56 +02:00
madmaxoft
8821c476bb
Fixed previous commit's wrong assumptions.
...
The equipment-getting functions return a copy already, so we can't take a pointer, really.
2014-09-01 14:35:52 +02:00
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
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
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