madmaxoft
993fd14ddf
Fixed basic whitespace problems.
...
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
Tiger Wang
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01:00
Tiger Wang
db36f1a9fa
Fixed crash with entities in unloaded chunks
...
* Fixes #1190
2014-07-17 13:54:28 +01:00
Tiger Wang
c3b4b70a73
Merge pull request #1183 from Howaner/Sounds
...
Reset meta to zero when the blocks explode
2014-07-17 10:39:38 +01:00
madmaxoft
70f304a96b
Fixed 3 MSVC warnings in SplashPotionEntity.
2014-07-17 11:07:33 +02:00
madmaxoft
430d8b42a5
Updated cPawn::KilledBy signature for custom death messages.
2014-07-17 11:07:10 +02:00
madmaxoft
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
madmaxoft
64c8b0d51b
Reformatted cItemPotionHandler.
2014-07-17 10:51:44 +02:00
madmaxoft
cd1e6f8ef0
Fixed formatting for cWitherSkullEntity
2014-07-17 10:24:29 +02:00
Mattes D
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
madmaxoft
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
Tiger Wang
174906efca
Another fix for excessive food drain
2014-07-16 22:22:45 +01:00
Tiger Wang
960fcaa90c
Fixed a bug with buckets
...
* Additionally fixed cLineBlockTracer's EntryFace parameter when a block
was hit on the first iteration along the projected line
2014-07-16 22:22:00 +01:00
Tiger Wang
9194438fb5
Fixed another redstone simulator crash
2014-07-16 22:21:00 +01:00
Mattes D
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
Tiger Wang
c5d00f3ec5
Suggestions
2014-07-16 12:05:09 +01:00
Tiger Wang
2189f37c20
Resolved backwards compatibility issues
2014-07-16 11:38:52 +01:00
Tiger Wang
ad247735fd
Function rename
2014-07-16 11:23:26 +01:00
Tiger Wang
f2c4f56ccd
Unified functions
...
Thanks @Howaner!
2014-07-16 11:21:02 +01:00
Tiger Wang
1f6854792c
Store properties as Json::Value
2014-07-16 00:03:47 +01:00
Tiger Wang
1df5a1f237
Fixed a DropSpenser AddFace bug
2014-07-15 22:53:44 +01:00
madmaxoft
3f8ec7699f
Merge remote-tracking branch 'origin/master' into potions
2014-07-15 22:42:00 +02:00
madmaxoft
cc452f51c8
Restructured cSplashPotionEntity code.
...
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
Tiger Wang
74155f947c
Merge pull request #1191 from Masy98/Blocks
...
Removed stairs and carpet from IsSolid
2014-07-15 21:09:41 +01:00
Masy98
b579451731
Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.
2014-07-15 20:34:49 +02:00
Masy98
d272e46821
Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.
2014-07-15 20:32:49 +02:00
Howaner
74b6bf01a9
Derp.
2014-07-15 18:33:28 +02:00
Mattes D
5147220f12
Merge pull request #1189 from Masy98/Blocks
...
Added various missing blocks in the lists in BlockInfo.cpp
2014-07-15 14:54:45 +02:00
madmaxoft
9a970479ef
Fixed code formatting.
2014-07-15 14:54:24 +02:00
madmaxoft
639dfdb67d
Merge remote-tracking branch 'origin/ClearMetaMixin'
2014-07-15 14:44:18 +02:00
Masy98
7f4029f8f4
Added Brick fence to m_Transparent
2014-07-15 14:06:03 +02:00
Tycho
57f4e871bb
Fixed FindClosestPlayer
2014-07-15 12:52:02 +01:00
Masy98
2d245264b1
Added various missing blocks in the lists in BlockInfo.cpp
2014-07-15 13:34:45 +02:00
Tycho
01a31a1872
Added super typedef
2014-07-15 12:27:36 +01:00
madmaxoft
f5259d7651
Only the cEntityEffect::effXXX constants are Lua-exported.
...
The rest of the classes don't need exporting, there's no interface using them anyway.
2014-07-15 11:24:48 +02:00
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
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
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
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
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
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
Tiger Wang
9f4348fb09
Simplified buckets code slightly
2014-07-12 22:50:28 +01:00
madmaxoft
e2e0f52ecb
cNBTChunkSerializer: Fixed alignment.
2014-07-12 23:48:39 +02:00
madmaxoft
d72a81cb8e
cHopperEntity: Simplified chest conditions.
2014-07-12 23:34:32 +02:00
madmaxoft
c4f1284d9c
cChestEntity: Renamed a member to avoid confusion.
2014-07-12 23:30:34 +02:00
madmaxoft
9ab0f259c7
Fixed alignment.
2014-07-12 23:25:59 +02:00
Tiger Wang
084dec6ccf
Merge pull request #1162 from daniel0916/Fixes
...
Fix for bucket placing
2014-07-12 22:09:50 +01:00
Tiger Wang
e71e432633
Suggestions and bug fix
...
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
2014-07-12 22:06:25 +01:00
daniel0916
68668d7a6e
Changes
2014-07-12 12:44:59 +02:00
archshift
8cbd43e043
Added splash potions to NBT serialization and retrieval
2014-07-11 18:58:11 -07:00
archshift
83c69134c0
Merge remote-tracking branch 'origin/master' into potions
2014-07-11 17:37:28 -07:00
archshift
4e6395d6ff
For now, removed creator member from Entity Effect for pointer safety
2014-07-11 17:27:29 -07:00
madmaxoft
f73042fb02
Simplified the player data loading.
2014-07-11 23:12:57 +02:00
Tiger Wang
416c160fb5
Suggestions
2014-07-11 19:40:33 +01:00
daniel0916
ca6bcacdb9
Changes
2014-07-11 17:58:35 +02:00
Tiger Wang
6a33fa84ae
Suggestions
2014-07-11 12:43:24 +01:00
madmaxoft
ebea2b7efc
Player data filenames are based on UUID.
2014-07-11 13:13:10 +02:00
Tiger Wang
df65e8b7bb
Improved LinkedPowering speed
...
* Additionally fixed wires powering other wires through blocks
2014-07-11 12:06:16 +01:00
madmaxoft
6cea81e383
Fixed a missing return value.
2014-07-11 00:06:58 +02:00
madmaxoft
2bd486660a
Preparation for player UUID-based storage: LoadFromFile()
2014-07-11 00:06:05 +02:00
madmaxoft
729cc7f6ff
Fixed style consistency.
2014-07-10 23:04:33 +02:00
