1
0
Commit Graph

6248 Commits

Author SHA1 Message Date
madmaxoft
5193335efa Reformatted EntityEffect code. 2014-07-15 09:48:11 +02:00
madmaxoft
d274851578 Fixed a MSVC warning in cEntityEffect::CreateEntityEffect(). 2014-07-15 09:43:45 +02:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
madmaxoft
e2a1118f88 Pass cItem by reference.
Fixes CID 66445.
2014-07-15 08:48:12 +02:00
madmaxoft
7195c7dfe2 Added missing member initialization to cGridStructGen.
Fixes CID 68228.
2014-07-15 08:28:31 +02:00
Tycho
0e5fa2662a COnverted Lilypad back to mixin 2014-07-15 00:01:16 +01:00
Tycho
8fd636aa72 Revert "Converted some blockhandlers to use cClearMetaOnDrop"
This reverts commit 333f4f982c.
2014-07-14 23:59:24 +01:00
Tiger Wang
82fe5c05f0 Fixed redstone simulator crash
* Fixes #1176
* Fixed #1186
2014-07-14 23:03:30 +01:00
Tiger Wang
5b1552435f Fixed some meta resetting bugs
* Fixes #1174
* Fixes #1171
2014-07-14 21:57:44 +01:00
Tiger Wang
ad6494fb36 Maybe improved arrow sinking 2014-07-14 21:56:40 +01:00
Tiger Wang
f0187cc8f9 Fixed placing liquids over liquids
* Fixes #1182
2014-07-14 21:55:46 +01:00
archshift
40bb98510a ItemHandler.cpp: removed redundant food and drink checks 2014-07-14 13:46:43 -07:00
archshift
061010288a Readability and clarity changes 2014-07-14 13:46:43 -07:00
Tycho
2cd3443fbb Added documentation 2014-07-14 21:21:17 +01:00
Tycho
333f4f982c Converted some blockhandlers to use cClearMetaOnDrop 2014-07-14 20:50:56 +01:00
Tycho
093b5c6456 Simplified ClearMetaOnDrop 2014-07-14 20:33:30 +01:00
Tycho
515c3cbc67 Added cClearOnDrop Mixin to cPumpkin 2014-07-14 20:28:16 +01:00
Tycho
1929d16724 Added first implementation of cClearMetaOnDrop 2014-07-14 20:26:36 +01:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Howaner
1c6c612f76 Reset meta to zero when the block explode. 2014-07-14 19:07:31 +02:00
Mattes D
a4d9ccded4 Merge pull request #1177 from mc-server/ChestFix
Fixed Issue with Comparing agast the wrong chest, potentially causing crashes
2014-07-14 16:29:56 +02:00
archshift
554e1c0dd3 OnEntityAddEffect.lua: Removed Originator param 2014-07-13 16:10:01 -07:00
archshift
0409daf736 EntityEffect: Inlined functions, added explicit copy constructor and operator. 2014-07-13 15:43:49 -07:00
archshift
f77723128c Changed separating comment style from asterisks to slashes. 2014-07-13 15:23:23 -07:00
Mattes D
69eaa55b55 Merge pull request #1172 from mc-server/coverity_fixes
Coverity fixes
2014-07-13 17:10:57 +02:00
madmaxoft
8bb0baa842 Tolua driver: Fixed wrong indentation. 2014-07-13 17:07:55 +02:00
worktycho
4315deb90b Added parenthasies 2014-07-13 16:07:35 +01:00
Tycho
6892b448db Merge branch 'master' into ChestFix 2014-07-13 16:03:29 +01:00
worktycho
e1a561286a Fixed Issue with Comparing agast the wrong chest, potentially causing crashes. 2014-07-13 16:03:14 +01:00
Mattes D
760fe6b99d Merge pull request #1178 from mc-server/projectilefix
Made projectile a_Item into a pointer
2014-07-13 16:48:13 +02:00
worktycho
132b367316 CopyPaste Error
Fixes CID 70460.
2014-07-13 15:32:44 +01:00
worktycho
64697f0cab Another COpyPaste Error
Fixes CID 70461
2014-07-13 15:29:43 +01:00
Tycho
2a0c041ad8 Adjusted calls to CreateProjectile that passed Items 2014-07-13 15:25:52 +01:00
worktycho
4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01:00
worktycho
bfc485bfe2 Fix CopyPaste error that ment a_MaxRelX wasdn't checked
Fixes CID 70464
2014-07-13 15:05:54 +01:00
madmaxoft
31415aec63 Fixed MSVC warnings in SoundEffect functions. 2014-07-13 13:31:09 +02:00
Howaner
9b0b57bcbc Update. 2014-07-13 11:11:40 +02:00
Howaner
e48d172f49 Merge branch 'master' into Sounds 2014-07-13 11:09:19 +02:00
Mattes D
826ed2ddab Merge pull request #1167 from Howaner/Plugins
Fixed diamond mover plugin
2014-07-13 11:07:21 +02:00
Mattes D
48b5c11022 Merge pull request #1133 from Howaner/Sheep
Sheep fixes
2014-07-13 11:04:24 +02:00
Mattes D
398cead1f3 Merge pull request #1166 from Howaner/GlobalFixes
Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE)
2014-07-13 11:02:28 +02:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Howaner
f1491ad1d1 Fixed diamond mover plugin 2014-07-13 01:18:41 +02:00
Tiger Wang
6484e9814a Only one instance of server can be started
This disallows the UDP multicasting that the original code enabled.

xoft deterrent, in PR #1151 you implied that this was unwanted behaviour
(but comments gone now as I force pushed - check emails?).

Revert at will if unsatisfactory :P
2014-07-13 00:17:33 +01:00
Tiger Wang
e11f41d048 Revert failed fix for #31
This reverts commit 69dc9b4c9a.
2014-07-13 00:17:31 +01:00
Howaner
dc5c43c0aa Changed comments. 2014-07-13 01:04:43 +02:00
Howaner
4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
Howaner
905fed09a6 Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) 2014-07-13 00:51:42 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
Tiger Wang
945dfe75d7 Comment grammar correction 2014-07-12 22:52:45 +01:00