flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
2,585 Commits 1 Branch 0 Tags 92 MiB
b182f25324
Commit Graph

1864 Commits

Author SHA1 Message Date
Tiger Wang
fe6fa23a97 Second round of fixes 
* Implemented suggestions
 2013-10-09 21:02:59 +01:00
madmaxoft
76d056e5f7 Fixed cFile::CopyFile Linux compilation. 2013-10-09 14:19:14 +02:00
madmaxoft
9fc35514e6 APIDump: Documented the new cFile API functions. 2013-10-09 11:31:38 +02:00
madmaxoft
55999ee118 Moved cMakeDir::MakeDir to cFile::CreateFolder. 
And exported to Lua.
 2013-10-09 09:57:48 +02:00
madmaxoft
2ff882f239 Added static cFile functions to Lua API. 2013-10-09 09:38:47 +02:00
madmaxoft
36f24e30b7 Fixed warning in cFireSimulator. 
All code paths now have a return value.
 2013-10-09 09:09:47 +02:00
Tiger Wang
7401fc000d Initial round of fixes 
* Fixed intentional misspelling of baby! :D
* Better chested horse bool name
* Fixed some weird continuity issues with my recent changes not being
pushed up initially
* Fixed derpy hexadecimal values
 2013-10-08 22:21:55 +01:00
Tiger Wang
5db6213f34 Initial Metadata Commit [SEE DESC] 
+ Pigs, Minecarts, Sheep, Skeletons, Slimes, Villagers, Wolves, and
Horses have metadata
+ Base code on taming wolves, shearing sheep, and taming horses
+ Sheep and horses have different colours when spawned
 2013-10-08 19:20:49 +01:00
madmaxoft
a120507be0 Implemented the two memory-statistics functions in cRoot. 
This fixes #185. cWebAdmin::GetMemoryUsage() is accessible but deprecated (with a warning output to the screen).
 2013-10-08 20:12:34 +02:00
madmaxoft
a4cbe9fbb1 Cleaned up cEntity's enums. 
Several were obsoleted and unused, others weren't supposed to be exported to the Lua API.
 2013-10-08 19:49:33 +02:00
Mattes D
e3ba3b8f97 Merge pull request #208 from mc-server/NewWebServer 
New web server
 2013-10-07 13:19:14 -07:00
madmaxoft
68605b6dce Fixed startup timings on server restart. 2013-10-07 10:46:35 +02:00
madmaxoft
4c4475f3b5 Fixed authenticator thread restart. 
This fixes #209.
 2013-10-07 10:46:34 +02:00
madmaxoft
d8dfa8cd88 Plugin folders now check for "." and "..". 
This fixes #207.
 2013-10-06 16:58:19 +02:00
madmaxoft
f55b77a98a Fixed memory leaks in the HTTP framework 2013-10-06 16:40:28 +02:00
madmaxoft
4bf596a586 cListenThread: Fixed thread termination. 2013-10-06 16:18:15 +02:00
madmaxoft
d147935853 Added proper shutdown to HTTPServer. 2013-10-06 15:44:40 +02:00
madmaxoft
dabbf24f58 Merge branch 'master' into NewWebServer 
This should simplify merging
 2013-10-06 15:44:14 +02:00
madmaxoft
fe582b69d5 Removed remnants of the old webserver. 2013-10-06 14:38:10 +02:00
madmaxoft
b5c90d7b20 WebAdmin uses the new HTTP functionality. 
This is a partial implementation of #183.
 2013-10-05 23:08:16 +02:00
madmaxoft
20d07a683f Fixed Base64Decode() returning wrong value. 2013-10-05 21:52:45 +02:00
madmaxoft
2b8bddbdc3 cHTTPConnection sends Content-Length with HTTP errors, too. 2013-10-05 21:52:14 +02:00
madmaxoft
db3d83b38d Added Basic auth support to cHTTPRequest. 2013-10-04 20:28:30 +02:00
madmaxoft
1012fd82fd HTTP Server can now parse multipart/form-data forms; better architecture. 2013-10-04 13:13:34 +02:00
madmaxoft
9a33732f6a Fixed MultiPartParser's boundary parsing. 2013-10-04 13:10:30 +02:00
madmaxoft
d8229a5531 Added cEnvelopeParser and cMultipartParser. 2013-10-04 13:10:30 +02:00
madmaxoft
58f5ac84ab Added cNameValueParser. 2013-10-04 13:10:30 +02:00
madmaxoft
e31343297e Added StrToLower(), URLDecode() and ReplaceAllCharOccurrences(). 2013-10-04 13:10:29 +02:00
madmaxoft
8fb80b6369 Optimized cBlockFarmlandHandler in wet weather. 
The area isn't read at all when the weather is wet, since it isn't needed.
 2013-10-04 08:39:59 +02:00
madmaxoft
dcea29ec30 Added cWorld::IsWeatherXXX() functions 2013-10-04 08:38:38 +02:00
Samuel Barney
d1448d12a0 Added comparison for desert biomes. 2013-10-03 21:39:07 -06:00
Samuel Barney
0e1e76fa77 Rain now waters farmland. 2013-10-03 21:35:17 -06:00
Samuel Barney
523c6b4b94 Merge branch 'master' of https://github.com/mc-server/MCServer 2013-10-01 17:48:06 -06:00
Samuel Barney
2855a330d4 Added glass pane as transparent. Removed excess g_BlockOneHitDig[E_BLOCK_REDSTONE_WIRE]. 2013-10-01 11:48:07 -06:00
Mattes D
ba8152608f Merge pull request #193 from tigerw/bugfixes 
Startup messages revision.
 2013-10-01 02:40:13 -07:00
Mattes D
d7fa9c9ff2 Merge pull request #199 from tigerw/moar-bugfixes 
Fixed a fire simulator bug
 2013-10-01 02:38:48 -07:00
Tiger Wang
20902e125c Removed unneeded statement 
Also LOGINFO'd "Starting WebAdmin"
 2013-09-30 21:17:52 +01:00
Tiger Wang
c4750ef003 Fixed issues 2013-09-30 21:15:48 +01:00
Tiger Wang
ab34da78e7 Fixed a fire simulator bug 
Fire now doesn't stay when it isn't on a flammable block.

Fixes the "fire creates chandeliers" bug in report #131
 2013-09-29 23:39:58 +01:00
Tiger Wang
9c7cfd29ad Improvements to startup timer 
As suggested by xoft. Also reverted changes of displayed protocol
version.
 2013-09-29 21:37:50 +01:00
madmaxoft
bb0fb0aa30 Improved the HTTPFormParser code. 
No change to the functionality.
 2013-09-28 23:02:16 +02:00
Tiger Wang
cc5c56d545 Minor startup streamlining 
* LOGD'd unneeded debugging messages, streamlining startup
+ Added a basic timer for how long in seconds it took to start up
+ Added two checks for plural (plugin/s, second/s)
 2013-09-28 20:36:01 +01:00
madmaxoft
b883a0b514 Fixed recognition of multipart-form-data forms. 2013-09-28 20:06:35 +02:00
madmaxoft
8130e6dd54 Created basic cHTTPFormParser. 
It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
 2013-09-28 19:30:25 +02:00
madmaxoft
3b473f7a67 Added URLDecode() and ReplaceAllCharOccurrences() to StringUtils. 2013-09-28 19:28:19 +02:00
madmaxoft
c22ea7efff Added UserData to cHTTPRequest. 
Callbacks may store one pointer of per-request data in the cHTTPRequest object. The object doesn't touch this data (doesn't own it).
 2013-09-27 21:38:54 +02:00
madmaxoft
5cf8fc12ae Added cHTTPServer callbacks; fixed keep-alives. 
The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
 2013-09-27 21:28:41 +02:00
madmaxoft
8c57c5c1f2 Fixed leaking HTTPRequest objects 2013-09-27 20:48:44 +02:00
madmaxoft
0c3fd5e77d Fixed parsing and implemented write nofitication. 
The web connection finally works with a browser.
 2013-09-27 20:33:18 +02:00
madmaxoft
d0b9e81795 Split cHTTPConnection implementation into a separate file. 2013-09-27 19:34:46 +02:00
madmaxoft
f4efcb9080 Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes. 2013-09-27 18:14:26 +02:00
madmaxoft
e5d5896a24 Fixed a typo in cEntity doxycomments. 2013-09-27 16:34:01 +02:00
madmaxoft
0b8f47face Removed cChunkDesc::SetChunkCoords() from Lua API. 2013-09-25 09:02:49 +02:00
madmaxoft
11e0c73ffd Implemented basic HTTP message header parsing. 2013-09-24 20:52:37 +02:00
madmaxoft
4a00d26da9 Fixed a few compiler warnings 2013-09-22 21:43:00 +02:00
Mattes D
63c627f68f Merge pull request #186 from tigerw/bugfixes 
One feature and a few changes
 2013-09-22 12:31:53 -07:00
Tiger Wang
dad3648102 Removed some unneeded includes 2013-09-22 19:48:59 +01:00
Tiger Wang
0fcbaca0ed Changed a comment 
Was a remnant of my TypeType minecarts :D
 2013-09-22 19:35:35 +01:00
Tiger Wang
a8a45a4afc Added button placement handler 
Also removed an unneeded variable in the stair handler
 2013-09-22 19:34:42 +01:00
Tiger Wang
5c22a9f5f0 Removed OnDigging for Redstone devices 2013-09-22 19:16:56 +01:00
Tiger Wang
5d2831ddb9 Increase piston delay to a second 
Another fix for #57
 2013-09-22 18:19:51 +01:00
Tiger Wang
9d46fa6ae9 Changed to SetBlockMeta 2013-09-22 18:18:04 +01:00
mgueydan
ac4cb65b8d Merge branch 'master' into MobSpawning 2013-09-22 14:29:33 +02:00
madmaxoft
19d5cc0e66 Updated coding style to match ours. 2013-09-22 09:46:23 +02:00
Samuel Barney
adf84a05fa Implemented Apple-specific GetMemoryUsage. 2013-09-21 18:21:37 -06:00
madmaxoft
184bcd3dd1 Prepared cWebAdmin for Apple-specific GetMmeoryUsage() 2013-09-21 22:40:14 +02:00
madmaxoft
c56bc4b01c Fixed Linux threading issues. 2013-09-21 20:44:16 +02:00
madmaxoft
744b3be454 Fixed cFile:IsFolder() and plugin-loading. 
This should fix loading plugins on Linux.
 2013-09-21 19:45:11 +02:00
madmaxoft
6b61df3b73 Implemented cWebAdmin:GetMemoryUsage() on Linux proper. 
Also the function now returns an int, number of KiB used, or -1 on failure.
 2013-09-21 19:00:01 +02:00
madmaxoft
405d434c06 Fixed pickup spawning with inherited gamemode. 2013-09-21 18:08:30 +02:00
madmaxoft
91325d706d Linux compilation fix #3. 2013-09-21 11:18:37 +02:00
madmaxoft
c7fe42be26 Linux compilation fix #2. 2013-09-21 11:15:53 +02:00
madmaxoft
ea0addc2b9 Fixed Linux compilation. 2013-09-21 11:10:35 +02:00
madmaxoft
f3d0cdc9bc Fixed compilation from previous commit. 2013-09-21 11:05:44 +02:00
madmaxoft
5cfc108e83 Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes 2013-09-20 22:02:11 +02:00
Tiger Wang
0c58adb2b4 Fixed pickup block spawning 2013-09-19 21:46:39 +01:00
Tiger Wang
57dfdd3205 Implemented xoft's suggestions 2013-09-19 21:21:56 +01:00
Tiger Wang
ecf40e2893 Fixed new monster aggressiveness issue 2013-09-19 21:20:21 +01:00
madmaxoft
f08d78c887 Fixed rounding errors in cProtocol125::SendExplosion(). 
This should fix #129.
 2013-09-19 22:03:02 +02:00
madmaxoft
18d795d8da Fixed a crash in cEntity when the entity was at BlockY == 0. 2013-09-19 21:35:58 +02:00
madmaxoft
111fd58914 Added support for 1.6.3 and 1.6.4 protocols. 
No relevant changes have been detected, using the 1.6.2 protocol handler.
 2013-09-19 20:49:09 +02:00
Tiger Wang
198ac1892c Fixed pickups 2013-09-18 22:20:08 +01:00
Tiger Wang
3e698d7b72 Added moar mobs! 
+ Added dragons
+ Added golems
+ Added giants
+ Added horses
+ Added some missing items
+ Added missing spawn egg metas
 2013-09-18 22:17:43 +01:00
madmaxoft
47ef25ce77 Added a global "g_Plugin" object to all Lua plugins. 
This allows plugins to have an empty Initialize function and implementing all their initialization at global level, thus modularising everything.
 2013-09-18 22:31:44 +02:00
madmaxoft
a2d5f86769 Improved error message in cPlugin:AddWebTab() API. 2013-09-18 22:30:36 +02:00
madmaxoft
66da02519a Added cPlugin:GetLocalFolder() API function. 
This supersedes the cPlugin:GetLocalDirectory() function.
 2013-09-18 22:15:12 +02:00
madmaxoft
edd7363edd Proper folder / file distinction in plugin loading. 2013-09-18 20:40:09 +02:00
madmaxoft
403e0d5be4 cPluginManager:BindConsoleCommand can be called with the dot operator, too. 2013-09-18 20:40:09 +02:00
madmaxoft
b66031de65 cPluginManager:BindCommand can be called with the dot operator, too. 2013-09-18 20:40:09 +02:00
Tiger Wang
846f1223f4 Implemented redstone comparators 
They can be placed and toggled, but stills needs proper redstone support
 2013-09-18 18:27:21 +01:00
Mattes D
aa2edeae77 Merge pull request #176 from tigerw/bugfixes 
Fixed repeater and wood placement
 2013-09-17 23:09:35 -07:00
Tiger Wang
480991d1ac Multiple fixes [SEE DESC] 
- Removed two random block handling files in the item handling section
that didn't do anything. (One was an attempt at making slabs work, but
failed to realise that the coords would have to be the block CLICKED,
and another was just a random empty file for handling wooden planks.)
* Fixed placing repeater blocks not directioning properly
* Fixed wood directions breaking plank metadata
 2013-09-18 00:01:20 +01:00
Mattes D
4c1f1cc539 Merge pull request #175 from tigerw/bugfixes 
Bugfixes
 2013-09-17 13:57:14 -07:00
Tiger Wang
ab696c37c3 Snow now supports meta values 
Fixes #98
 2013-09-17 21:22:26 +01:00
Tiger Wang
a3a3a6ebe6 Added wood directions 
+ Added wood directions
 2013-09-17 20:59:36 +01:00
Tiger Wang
f2b7b220a4 Fixed undead burning 
(c'mon xoft, test ya code :P)
 2013-09-17 20:57:35 +01:00
Alexander Harkness
59cf62f268 Merge pull request #172 from tigerw/bugfixes 
Fixes to torches and entities - because they were derpy zubzubs.
 2013-09-17 02:28:09 -07:00
Tiger Wang
efe520727d Fixed derpy comparison 2013-09-16 21:07:25 +01:00
Tiger Wang
9711fd7970 Fixed friction for entities 
Due to a misplaced else, other entities weren't getting friction
 2013-09-16 19:19:25 +01:00
Tiger Wang
506a693339 Torch fixes [SEE DESC] 
* Torches snap to neighbour when placed on bottom
* CanBeAt takes into account cobblestone walls
+ Used more BLOCK_FACEs instead of numbers
 2013-09-16 19:18:36 +01:00
Alexander Harkness
e875bbe2e6 Fixed missing newline. 2013-09-16 19:16:05 +01:00
tonibm19
f215402c6c Vanilla like maximum and default view distance 2013-09-16 20:07:33 +02:00
Matyas Dolak
7e0f56ccce Attempt at fixing linux crash on player login. 
Ref.: http://forum.mc-server.org/showthread.php?tid=1244
 2013-09-16 15:23:16 +02:00
madmaxoft
9f7b2e259d Exported cMonster:GetMobType() to the Lua API. 2013-09-16 11:42:20 +02:00
madmaxoft
79851476d2 Removed cWorld:SaveAllChunks() from the API. 
Use cWorld:QueueSaveAllChunks() instead, the old function was prone to deadlocks.
 2013-09-16 10:15:25 +02:00
madmaxoft
40d295da26 cWorld:QueueTickBlock takes the delay in ticks. 2013-09-16 09:25:23 +02:00
madmaxoft
a6b3c560a2 Fixed doxycomments of cWorld plant-growing code 2013-09-15 22:11:02 +02:00
madmaxoft
4aa14c0264 Fixed previous commit 2013-09-15 22:09:45 +02:00
madmaxoft
530f6f2b71 Removed cWorld deprecated API: SetWorldTime() 2013-09-15 21:55:24 +02:00
madmaxoft
5514a6169f Removed obsoleted cWorld functions from the API: 
GetClassStatic() (is used only internally by ManualBindings)
GetTime() (is replaced with GetWorldAge() and GetTimeOfDay()
 2013-09-15 21:53:36 +02:00
madmaxoft
5d2d0fe109 Fixed previous commit. 2013-09-15 21:52:25 +02:00
madmaxoft
f8947ce18e Fixed API bindings of cWorld:GetSignLines(), exported cWorld:UseBlockEntity(). 2013-09-15 21:47:56 +02:00
madmaxoft
a7ad5715f9 Fixed tigerw's leftovers. 2013-09-15 20:59:05 +02:00
madmaxoft
b34e92571a Updated the bindings again. 2013-09-15 20:52:25 +02:00
madmaxoft
5cde7d8a29 Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickups 
Conflicts:
	source/BlockID.cpp
	source/Entities/Entity.cpp
 2013-09-15 20:49:08 +02:00
madmaxoft
4e200df18c Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes 
Conflicts:
	source/Blocks/BlockTorch.h
 2013-09-15 20:34:22 +02:00
madmaxoft
9a35c1c150 Fixed cWorld bindings for GetBlockInfo() and GetBlockTypeMeta(). 
They no longer require the superficial arguments.
 2013-09-15 20:29:20 +02:00
Tiger Wang
91a13c8e87 Fixed pistons pulling un-pullables 2013-09-15 16:40:09 +01:00
Tiger Wang
30b8300ad3 Mycelium now has correct placement sound 2013-09-15 15:56:02 +01:00
Tiger Wang
fc3d5ff5a6 Torches work properly 
Also fixed a naming inconsistency concerning quartz stairs.
 2013-09-15 15:55:35 +01:00
Tiger Wang
a8cb2bd90e Removed leftover CanBePlacedOnSide 2013-09-15 12:20:13 +01:00
Tiger Wang
411f0b5fa4 Removed leftover DoesAllowBlockOnTop 2013-09-15 12:18:14 +01:00
Tiger Wang
11bbfbc98a Added break 2013-09-15 12:15:27 +01:00
madmaxoft
37b3b5defb Updated the automatic bindings. 2013-09-15 00:14:03 +02:00
madmaxoft
a1c5ad0594 Set the minimum viewdistance to 3. 
Fixes #167.
 2013-09-14 21:34:26 +02:00
madmaxoft
2973b17977 Fixed empty-handed itemhandler. 
This should fix FS 430.
 2013-09-14 08:16:56 +02:00
Tiger Wang
4cdf776759 Removed torch top placement prevention 2013-09-13 21:08:36 +01:00
Tiger Wang
1cbb38fb02 Removed place on top and side preventions 2013-09-13 20:17:39 +01:00
Tiger Wang
47119b3027 Even better pickup physics 2013-09-13 19:54:50 +01:00
tonibm19
973753774e Added an extra line. 
In first commit it says I removed first line
 2013-09-13 20:06:42 +02:00
tonibm19
b703d9c83b Fixed mobs attack range being too long 
It was set to 5, I think 2 is better because now mobs can kill you when there is a block (or 2) between you and monster.
 2013-09-13 19:33:22 +02:00
Tiger Wang
22b8f3a2e0 Even more fixes [SEE DESC] 
* Fixed minecarts breaking completely due to stuff
* Rails are now non solid again
+ Added IsRail inline bool
- Removed Herobrine
 2013-09-12 23:57:02 +01:00
Tiger Wang
a39564a46a Fixed water speed issues 2013-09-12 23:31:26 +01:00
Tiger Wang
8163ca9549 Implemented xoft's suggestions again 2013-09-12 10:25:13 +01:00
Tiger Wang
a1d5d25525 Implemented xoft's suggestions 
I totally didn't copy this from the fire simulator...

(I did, but I changed it quite a bit :P)
 2013-09-11 22:10:29 +01:00
madmaxoft
791ced42cc Added StringSplitAndTrim() to Lua API 2013-09-11 21:22:25 +02:00
Mattes D
85804d085d Merge pull request #159 from tigerw/bugfix 
Multiple fixes and features
 2013-09-11 12:19:39 -07:00
Tiger Wang
3a1def2c90 More changes [SEE DESC] 
* Improved (again) pumpkin direction handling
* Fixed spacing in Entity.cpp
 2013-09-11 20:07:51 +01:00
Tiger Wang
8ef91817e9 Pumpkins 2013-09-11 19:02:09 +01:00
Tiger Wang
e9321bc715 Better player gamemode detection 2013-09-11 18:56:03 +01:00
Tiger Wang
277b26b4c2 Fixed two bugs 2013-09-11 18:51:27 +01:00
worktycho
37e0e684f4 moved reflection code to PlayerYawToMetadata 2013-09-11 17:07:54 +01:00
worktycho
3236364eee changed the subtaraction to a flip 2013-09-11 13:48:08 +01:00
Tiger Wang
cb167f78e3 Added player void damage 2013-09-10 23:02:35 +01:00
Tiger Wang
c8f8597774 Added void damage 2013-09-10 23:01:02 +01:00
Tiger Wang
010bc94a34 Entities now maintain speed outside of world 2013-09-10 22:51:07 +01:00
Tiger Wang
3d7813fdb2 Pumpkin and JackOLantern support 
Fixes #99
 2013-09-10 22:09:31 +01:00
madmaxoft
6dbe3296e0 Fixed codepage conversion 2013-09-10 22:03:11 +02:00
mgueydan
f12ac6b995 Inside cMonster::getMobFamily() : replacing Polymorphism by Map, in order to remove redundancy 2013-09-10 15:09:45 +02:00
mgueydan
bf4781d0ee Changing Bat to AMbiant creature 2013-09-10 14:26:27 +02:00