1
0
Commit Graph

2285 Commits

Author SHA1 Message Date
Tiger Wang
f5659a08b8 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/Entities/Player.cpp
2014-07-02 18:48:05 +01:00
Tiger Wang
c1ae5513ec Fixed player teleport food drain 2014-07-02 18:46:13 +01:00
Tiger Wang
19caba5125 Redstone simulator is alerted to lever unpowering
* Fixed the "fix" that broke the fix for #535, thereby fixing said issue
* Fixed #535
2014-07-02 18:46:00 +01:00
Mattes D
9204c8a124 Merge pull request #1139 from Howaner/Hooks
Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE
2014-07-02 16:33:24 +02:00
madmaxoft
1c16862ae5 CMake: Use cmake for file-copying.
This should enable MSYS builds.
2014-07-02 16:30:45 +02:00
Howaner
4a9002045b Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel() 2014-07-02 14:46:00 +02:00
madmaxoft
7177806d31 Fixed printf formats for Win builds 2014-07-01 22:48:01 +02:00
madmaxoft
0dfaad4123 Fixed a possibly unused variable. 2014-07-01 22:28:58 +02:00
Howaner
64e6667435 Only fixes the server crash. 2014-07-01 20:34:50 +02:00
Howaner
64f6ddf1e2 Fix server-crash with non-existing items. 2014-07-01 14:47:49 +02:00
Mattes D
4f60f5aef4 Fixed linking order under MinGW.
Ref.: #1044
2014-07-01 06:40:38 +02:00
Mattes D
f9f3f7eac5 Fixed size_t printfing under MinGW. 2014-06-30 21:58:23 +02:00
Howaner
8e11f7a1f6 Fixes. 2014-06-30 21:50:40 +02:00
madmaxoft
a5a0533d79 Fixed cFile compilation under MinGW. 2014-06-30 21:41:38 +02:00
Howaner
aa753a92c0 Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE 2014-06-30 15:12:56 +02:00
Howaner
4ded58bfd1 Unnecessary return 2014-06-30 14:19:31 +02:00
Tiger Wang
b9d4431f6f Fixed respawning
* Fixes #1103
2014-06-29 22:44:16 +01:00
Mattes D
3c631fc0f9 Fixed offline UUID generator.
It generated invalid UUIDs, too many hex chars.
2014-06-29 18:27:41 +02:00
Howaner
50e112788b Send statistics to the player, when he logged in. 2014-06-29 01:40:15 +02:00
Mattes D
1b89b997ff Merge pull request #1132 from mc-server/RemoveMD5
Removed the md5 library, obsoleted by PolarSSL.
2014-06-29 00:46:11 +02:00
Tiger Wang
35dc056f03 Likely fixed too quick food depletion
* Fixes FS427 properly, hopefully
2014-06-28 21:10:59 +01:00
Tiger Wang
5e66d9aeab Fixed issue with breaking blocks at -1 coordinates 2014-06-28 20:45:05 +01:00
Tiger Wang
61cb08b546 Implemented tripwire(s) (hooks)
* Fixes #944
2014-06-28 20:44:34 +01:00
Mattes D
1495bba17c Fixed a silly path error in #include. 2014-06-28 18:20:46 +02:00
Mattes D
48639ee4d2 CMake: Added polarssl include dir as non-system. 2014-06-28 18:16:26 +02:00
Mattes D
3e104c25e9 Changed include folders to work for Bindings, too. 2014-06-28 12:49:08 +02:00
Tiger Wang
de543ff73f Added more block exceptions to torches 2014-06-28 00:29:32 +01:00
Tiger Wang
0a20e19a64 Minor change to buttons and levers
+ They now detect if the block they are on occupies its voxel, instead
of just being solid
2014-06-28 00:29:19 +01:00
Tiger Wang
69befa9851 Fixed bad water/redstone simulator communication
* Fixes #713
2014-06-27 23:16:37 +01:00
Tiger Wang
b6df30831d Fixed server forcing players afloat
* Fixes #1131
2014-06-27 23:13:26 +01:00
Mattes D
9926abd4f5 Added generic entity-collecting.
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
2014-06-27 20:56:44 +02:00
Mattes D
d7bc5c5bd3 Added PolarSSL dependency to Bindings. 2014-06-27 20:23:05 +02:00
Mattes D
563f706422 Removed the md5 library, obsoleted by PolarSSL.
Fixes #1130.
2014-06-27 19:34:53 +02:00
Mattes D
e60b73ce69 Merged branch 'howaner/Bow'.
Removed the pickup collection broadcast due to bad code.
2014-06-26 18:42:28 +02:00
Mattes D
4826990ea0 Merged branch 'howaner/Pickups'. 2014-06-26 18:35:38 +02:00
Mattes D
0df644c9f7 FurnaceRecipe parsing: Fixed whitespace removing. 2014-06-26 18:28:10 +02:00
Mattes D
ec1015112c Fixed misformed trimming. 2014-06-26 18:20:12 +02:00
Mattes D
55bbdfa5d4 FurnaceRecipe: Moved the parsing into separate functions for clarity. 2014-06-26 18:18:41 +02:00
Mattes D
67e3c645d3 FurnaceRecipe parser: Made the parser more forgiving.
Errors don't cause a stop in the parsing, but rather just skip the offending line.
2014-06-26 17:52:37 +02:00
Mattes D
b90b0a1dff FurnaceRecipe parser: Added an else branch, changed to a switch. 2014-06-26 17:51:19 +02:00
Howaner
bf3229867b Add comment. 2014-06-26 17:26:47 +02:00
Howaner
cba273dc7e Fixed a comment and changed CombineCount to short. 2014-06-26 17:20:48 +02:00
Mattes D
3216fbabfd Merge remote-tracking branch 'origin/furnaceparsing' 2014-06-26 17:11:40 +02:00
Mattes D
7102e9edb0 Merged branch 'tonibm19/master'. 2014-06-26 17:09:28 +02:00
Howaner
9b7f1e3db8 Merge branch 'master' into Pickups 2014-06-26 15:56:44 +02:00
Howaner
f96955496f GameMode check 2014-06-26 15:56:03 +02:00
Howaner
eaf36766f6 Merge branch 'master' into Bow 2014-06-26 15:49:53 +02:00
Mattes D
af3779ab9a Merge pull request #1126 from mc-server/BlockInfoInit
BlockInfo is now a proper C++ singleton.
2014-06-25 22:23:57 +02:00
madmaxoft
e9aecfdf11 BlockInfo is now a proper C++ singleton.
It is properly initialized before it is ever used.
2014-06-25 08:07:06 +02:00
Howaner
dbcb7f819f Optimize combining. 2014-06-24 17:50:38 +02:00