1
0
Commit Graph

6876 Commits

Author SHA1 Message Date
Mattes D
b18794d835 Merge pull request #1284 from Howaner/Monster
Attempt to fix knockback and swimming.
2014-08-04 12:50:57 +02:00
Howaner
7bd414e9ed Merge branch 'master' into Monster 2014-08-04 12:11:38 +02:00
Mattes D
7b986e65d2 Merge pull request #1285 from mc-server/StrCaseRefactor
Refactored case-conversion functions.
2014-08-04 12:02:57 +02:00
Mattes D
f619a9953a Merge pull request #1283 from Howaner/GlobalFixes
Fixed skins in mc 1.7.9/1.7.10
2014-08-04 12:02:22 +02:00
madmaxoft
1fa210c7f9 Refactored case-conversion functions.
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
2014-08-04 11:30:20 +02:00
madmaxoft
054ce9bcc4 Anvil: Wolf owner not saved if not present. 2014-08-04 11:29:40 +02:00
Howaner
8cdcfcceb3 Changed properties for-loop. 2014-08-04 11:26:31 +02:00
Howaner
e70077361d Changed /** to /* 2014-08-04 11:23:35 +02:00
madmaxoft
122344bb7a Rewritten string case manipulation to use std::transform. 2014-08-04 08:00:49 +02:00
Howaner
7bea90d6ca Fixed warnings 2014-08-04 01:35:25 +02:00
Howaner
0911072d27 Attempt to fix knockback and swimming. 2014-08-04 01:34:12 +02:00
Howaner
65720c8db1 Merge branch 'master' into GlobalFixes 2014-08-03 22:21:49 +02:00
madmaxoft
b19874e6f2 Attempting a compilation fix for gcc / clang. 2014-08-03 22:19:43 +02:00
Howaner
977a9948b9 Fixed skins in mc 1.7.9/1.7.10 2014-08-03 22:15:26 +02:00
madmaxoft
3136fc6246 Wolf uses UUID for owner.
Fixes #1277.
2014-08-03 22:04:52 +02:00
madmaxoft
f5aaf52210 Debuggers: Added a Name-from-UUID cMojangAPI test. 2014-08-03 22:04:51 +02:00
madmaxoft
21f52676f3 cMojangAPI: Added UUID-to-Name lookup.
Also fixed the bindings, now all functions are static-like.
2014-08-03 22:04:51 +02:00
madmaxoft
98a13d97b3 Trailing whitespace fix. 2014-08-03 22:04:50 +02:00
madmaxoft
003f18bd0f Added cMojangAPI:GetUUIDFromPlayerName().
This is a simpler way to ask for a single name -> uuid conversion.
2014-08-03 22:04:50 +02:00
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