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

1924 Commits

Author SHA1 Message Date
madmaxoft
6075f7cecd Fixed memory leaks in cMobCensus, moved GetSpawnRate() to cMonster. 2013-10-20 14:00:45 +02:00
madmaxoft
71d06e3015 Fixed binary search in StringToMobType(). 2013-10-20 13:42:59 +02:00
madmaxoft
d16d0a7ab7 Fixed memory leaks in cMobSpawner. 2013-10-20 13:33:23 +02:00
madmaxoft
848d061de1 Moved all MobTypesManager functions to cMonster. 
This removes some of the memory leaks and is more logical in structure. Also the functions are exported to Lua.
 2013-10-20 13:25:56 +02:00
madmaxoft
359918127b Rewritten MobTypesManager not to leak memory. 2013-10-20 13:10:21 +02:00
madmaxoft
34928378b8 Fixed loading allowed mobs in world. 2013-10-20 10:23:30 +02:00
madmaxoft
0258213d24 Merge branch 'htmlescape'. 2013-10-20 09:14:30 +02:00
Alexander Harkness
3272b45bc5 Added a string reserve. 2013-10-19 21:30:54 +01:00
Alexander Harkness
5ba998174a Fixed compile error. silly parentheses creeping in. 2013-10-19 21:21:44 +01:00
Alexander Harkness
0677872d88 Changed the code according to xoft's suggestions. 2013-10-19 21:13:47 +01:00
Alexander Harkness
f7c9230106 Fixed general failings with everything. Fixes #211. 
My editor fixed some extra tabs in globals.
 2013-10-19 17:37:47 +01:00
Alexander Harkness
9701a7fb84 Added a HTML escaping function to cWebAdmin. 
Apparently my editor fixed some failed tabs too.
 2013-10-19 17:17:33 +01:00
madmaxoft
ca538d5323 Adapted code style. 2013-10-18 20:02:53 +02:00
madmaxoft
24aad485b9 StringToItem() recognizes "ItemName:Dmg" strings. 
This allows commands such as "/i woodenshovel:40"
 2013-10-18 18:13:20 +02:00
madmaxoft
546dbf3c53 Fixed item-breaking. 
This fixes #232.
 2013-10-18 18:01:19 +02:00
madmaxoft
5d4fa298d3 Fixed indentation and re-styled conditions. 2013-10-18 16:34:01 +02:00
Mattes D
2a9997881c Merge pull request #259 from tonibm19/patch-2 
Fixed horse saddle
 2013-10-18 07:29:23 -07:00
madmaxoft
e6bb025a9f Fixed webadmin logging. 
This fixes #262.
 2013-10-18 12:50:50 +02:00
Mattes D
8bba2b02a1 Merge pull request #253 from SamJBarney/master 
Merge of Mob Spawning code by mgueydan
 2013-10-18 03:41:43 -07:00
tonibm19
2c187e53b7 Moved lines 
don't know if I did well
 2013-10-17 21:28:45 +02:00
tonibm19
90c39c55a9 More fixes 
- You can only tame horses with nothing at hand
- Fixed rearing
 2013-10-17 18:41:52 +02:00
tonibm19
137ed5a556 Improved horse saddling [SEE DESC] 
Now it checks if horse is already saddled, and if it's, you don't lose the saddle. Also, if the horse isn't tammed, you can't saddle it.
 2013-10-16 19:50:59 +02:00
madmaxoft
6a1149cf46 Fixed compilation errors. 2013-10-16 15:15:51 +02:00
tonibm19
2f8a0a8a3a Added extra line 2013-10-15 21:26:43 +02:00
tonibm19
4ee2632d4f Fixed saddle horse 2013-10-15 21:25:33 +02:00
tonibm19
400cab0b86 Fixed a big fail.I did 2013-10-15 18:17:17 +02:00
tonibm19
06b7e09e70 Added extra line (yes, again) 2013-10-15 17:32:15 +02:00
tonibm19
fbba2e79eb Added basic milk code. 2013-10-15 17:31:26 +02:00
tonibm19
7d4c0582a8 Added extra line 2013-10-15 17:11:42 +02:00
tonibm19
8147ccd13b Added horse saddling 
It uses pig code, sorry if it don't works, i'm a noob, but it should work.
 2013-10-15 17:09:43 +02:00
Sofapriester
173e8684a5 Update BlockID.cpp 
Added g_BlockIsTorchPlaceable[E_BLOCK_STONE_BRICKS]          = true;
-> this should fix Issue #254
-> Please check if ok
Thx
 2013-10-15 00:46:32 +02:00
Samuel Barney
02baff6629 Removed reading default values from settings.ini for worlds. 2013-10-14 15:32:40 -06:00
Samuel Barney
210cd4eb50 General fixes to get the new Monster spawning code working. 
Also wrote in some code to use the default settings for monsters located in settings.ini
 2013-10-14 11:12:12 -06:00
Samuel Barney
318d552248 Merge branch 'MobSpawning' of https://github.com/mgueydan/MCServer into MobSpawning 
Conflicts:
	source/Mobs/Bat.h
	source/Mobs/Monster.h
	source/World.cpp
 2013-10-14 10:03:47 -06:00
Samuel Barney
5df5176f8d Merge branch 'master' of https://github.com/mc-server/MCServer 2013-10-14 09:42:43 -06:00
Samuel Barney
369b4abff8 Mobs no longer spawn up in the air. 2013-10-14 08:12:23 -06:00
madmaxoft
18bbe82f30 WebAdmin honors the [WebAdmin].Enable setting. 
This fixes #234.
 2013-10-13 22:19:13 +02:00
madmaxoft
efb7d4fd3e Fixed WebAdmin's request parameters. 
Also added doxycomments on what they really contain.
 2013-10-13 20:29:57 +02:00
madmaxoft
e62cac07c0 Merge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata. 2013-10-13 18:26:45 +02:00
Mattes D
790f25a9ac Merge pull request #226 from SamJBarney/master 
Crop blocks now respect light.
 2013-10-13 07:10:49 -07:00
madmaxoft
455d33963f Re-added the cWorld:GetSignLines() to the API. 
Somehow this got lost somewhere.
 2013-10-13 14:13:15 +02:00
Tiger Wang
d8d2f35e9d Eight round of fixes 
* Changed IsA() to *long if statement*
- Removed deprecated values in Entity.h - to blazes with the plugins!
* Renamed villager type enumerations to be LESS SHOUTY and more vt-y
+ Use vtMax for World.cpp testificate spawning
 2013-10-13 12:47:55 +01:00
Samuel Barney
277a18626d Removed faulty code dealing with water. 2013-10-12 16:38:07 -06:00
Tiger Wang
d0acb37aed Seventh round of fixes 
* Fixed arrows not critical-effecting because they were in MOBS! (derp)
* Used cMonster::mtXX as per xoft's suggestions
 2013-10-12 23:05:15 +01:00
madmaxoft
33e1ba4240 Added 1.7 biome constants. 2013-10-12 23:49:55 +02:00
Samuel Barney
c74d1ffb91 Crop blocks now respect water and light. Currently a block has to be "watered" or the crop has a chance of breaking anyways. 2013-10-12 15:25:47 -06:00
Samuel Barney
25c5df0e05 Fix: Wrong arg name 2013-10-12 14:52:51 -06:00
Mattes D
3f09294e93 Merge pull request #224 from tonibm19/patch-7 
Added Horses, Blazes and EnderDragons spawning.
 2013-10-12 13:33:31 -07:00
madmaxoft
0352e45898 Fixed and exported cWorld:QueueTask(). 
This implements #220.
 2013-10-12 22:24:59 +02:00
tonibm19
bfbc381e1d Added more ghast spawning probability 2013-10-12 20:26:57 +02:00
tonibm19
c28d3d7771 Added extra line 2013-10-12 20:21:28 +02:00
tonibm19
d86facc2bf Mob spawning changes 
Added EnderDragon, Blaze and Horse spawning.
 2013-10-12 20:18:35 +02:00
madmaxoft
420e164ea6 Fixed second logger constructor. 2013-10-12 11:26:42 +02:00
Tiger Wang
327abdd10d Sixth round of fixes 
* Made horse rearing time fixed instead of random
 2013-10-11 21:33:56 +01:00
Tiger Wang
e2aaf202ab Fifth round of fixes 
* Enumerated Villager spawning
 2013-10-11 20:57:22 +01:00
madmaxoft
a9e70c84b5 CompoGen and HeiGen read their settings in their respective Initialize() functions. 2013-10-11 10:18:01 +02:00
madmaxoft
47b64b63fa Added GetIniItemSet() function. 
It reads a block / item description from the specified INI file value and returns as cItem; stores and uses the default if value doesn't exist.
 2013-10-11 10:12:36 +02:00
Tiger Wang
ee2df34d03 Fourth round of fixes 
* Switchified WriteMobMetadata
* Renamed Horse functions to be better
 2013-10-11 01:00:16 +01:00
Tiger Wang
d7b2c534fd Third round of fixes 
* Split WriteMetadata into three functions for common, entity, and mob
* Edited a few mob sizes to Vanilla values
 2013-10-11 00:41:54 +01:00
madmaxoft
85eb85dbf9 Generator: Renamed cBiomeGenerator's Initialize() to InitializeBiomeGen(). 
This will allow initializing generators that implement both cBiomeGenerator and other generators.
 2013-10-10 15:49:24 +02:00
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