1
0
Commit Graph

6607 Commits

Author SHA1 Message Date
madmaxoft
36d1972336 ToLua driver: disabled output buffering. 2014-08-03 22:04:49 +02:00
madmaxoft
836de13797 Added cPlayer::GetUUID(). 2014-08-03 22:04:48 +02:00
madmaxoft
6ce61d1a6f Fixed a ToLua warning - operator = not supported. 2014-08-03 22:04:48 +02:00
STRWarrior
a24e960a89 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-03 15:32:45 +02:00
STRWarrior
dd9a19e395 VillageGen: Fixed a typo in comment 2014-08-03 15:31:59 +02:00
archshift
e461df0030 Entity.cpp: Air timer comment fix 2014-08-03 02:20:48 -07:00
archshift
9ecce2366e Code reduction and clarity fixes 2014-08-02 22:35:29 -07:00
archshift
3ffec92e79 Removed unused cPlayer::FoodPoison function 2014-08-02 22:27:27 -07:00
archshift
7915c4ca7c Entity.cpp: On portal check, use if-else for current dimension
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
2014-08-02 21:44:02 -07:00
STRWarrior
a44fbf2338 Added proper trees and height for SwamplandM biome 2014-08-02 21:44:16 +02:00
Mattes D
543b0ccf75 Merge pull request #1275 from Howaner/BlockEntitys
Verify beacon effects sent by the client before setting them.
2014-08-02 11:10:02 +02:00
Howaner
3b4255dbfe Fixed a bug who can used from hacked clients. 2014-08-02 00:14:05 +02:00
Tiger Wang
b5c0a4aa3a Fixed issues with autocomplete and time loading
* Fixes #1274
2014-08-01 22:15:34 +01:00
Tiger Wang
c865fc8ca5 Improved endermen code a little 2014-08-01 22:15:32 +01:00
Mattes D
941a182d8a Merge pull request #1255 from mc-server/NameToUUID
Name to UUID
2014-08-01 22:35:12 +02:00
Mattes D
00dace910f Merge pull request #1273 from Howaner/GlobalFixes
Added missing HOOK_BLOCK_SPREAD call.
2014-08-01 22:30:44 +02:00
Howaner
bfe11024ac Added missing HOOK_BLOCK_SPREAD call. 2014-08-01 19:37:08 +02:00
Mattes D
d2744713bb Merge pull request #1272 from Howaner/Food
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
Mattes D
35cfbfd51a Merge pull request #1269 from Howaner/BlockEntitys
Added beacon.
2014-08-01 17:43:02 +02:00
Howaner
86d84bcb73 Compile fix. 2014-08-01 17:29:17 +02:00
Howaner
160fa3a9a9 Import Statistics.h 2014-07-31 23:56:49 +02:00
Mattes D
a9317ac372 Merge pull request #1270 from Howaner/Options
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator
2014-07-31 23:45:01 +02:00
Mattes D
bc1cfd5942 Merge pull request #1271 from Howaner/GlobalFixes
Fixed water from ice and removed packed ice drop.
2014-07-31 23:37:37 +02:00
Tiger Wang
1094d91fba Merge pull request #1047 from mc-server/Enderman
Enderman attacks a player if he's looking at him
2014-07-31 22:20:05 +01:00
Howaner
09b63565bc Use "default:" in switch. 2014-07-31 23:19:05 +02:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
Howaner
cfaef0de38 Capitalised "incremental" 2014-07-31 23:11:51 +02:00
Howaner
87d195171a Changed IsSolid to FullyOccupiesVoxel 2014-07-31 23:08:08 +02:00
Howaner
84462ba8b2 Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. 2014-07-31 23:04:00 +02:00
madmaxoft
70fd7caf1f Removed trailing whitespace. 2014-07-31 22:54:45 +02:00
madmaxoft
ecb86935f8 Fixed UUIDs handling in cPlayer.
The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
2014-07-31 22:52:06 +02:00
Tiger Wang
ffd6797fe1 Comment suggestions 2014-07-31 18:17:21 +01:00
Howaner
bffad50436 Fixed water from ice and removed packed ice drop. 2014-07-31 18:41:48 +02:00
Howaner
f47765dcbd Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. 2014-07-31 18:21:45 +02:00
Howaner
c138d19c31 Updated documentation again. 2014-07-31 18:16:52 +02:00
Howaner
6b1f7e7a45 Renamed "select..." methods to "set..." and better IsValidEffect() function. 2014-07-31 18:15:39 +02:00
madmaxoft
59adf113f0 MojangAPI: Moved the settings to a separate ini section. 2014-07-31 17:22:48 +02:00
Tiger Wang
5a1f9e5044 Merge pull request #1267 from mc-server/RoofedForest
Added RoofedForest trees.
2014-07-31 13:23:50 +01:00
Howaner
c49d4fd215 Updated documentation. 2014-07-31 12:15:18 +02:00
Howaner
556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
madmaxoft
8b519bf6e2 MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). 2014-07-31 10:02:50 +02:00
Howaner
e6ca5a5ece Added window update. 2014-07-30 22:54:19 +02:00
Howaner
dcd226d904 Added beacon load/save. 2014-07-30 22:50:34 +02:00
STRWarrior
7821326370 Suggestions 2014-07-30 22:43:59 +02:00
Howaner
66d34b83d2 Added beacon documentation. 2014-07-30 22:31:43 +02:00
Howaner
ad4fa6eba8 Changed return type from GetPrimaryPotion() and GetSecondaryPotion() 2014-07-30 22:22:06 +02:00
Howaner
81e095adda Exported the beacon. 2014-07-30 22:19:51 +02:00
Howaner
89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
STRWarrior
6e0a8d393b Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage 2014-07-30 21:56:33 +02:00
STRWarrior
f232ef5cd6 Fixed doxy comment 2014-07-30 21:50:02 +02:00