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

1919 Commits

Author SHA1 Message Date
Samuel Barney
16bac5ace9 Made mob spawning code use the chunk so that it could use varying sizes of areas for different mobs. 2013-10-28 09:49:06 -06:00
madmaxoft
df20c19986 Renamed cWindow constants to include the "wt" prefix. 2013-10-28 13:30:24 +01:00
tonibm19
144b528257 Extra line 2013-10-27 10:42:16 +01:00
tonibm19
a42561cf5a Sheep fixes. 
Now amount of wool you get when shearing a sheep is random.
Sheeps only spawn in white color (I will add sheep dying soon).
 2013-10-27 10:41:25 +01:00
madmaxoft
3fa03e854f Added cChunk::UnboundedRelGetBlockLights(). 
This queries both BlockLight and SkyLight for the specified block.
 2013-10-27 09:19:13 +01:00
madmaxoft
a7d44d69dd Authenticator doesn't save the ini file. 
Didn't load it -> shouldn't save it.
 2013-10-27 09:09:39 +01:00
madmaxoft
f032a2ff74 Merge branch 'origin/LoadWorlds/cAuthenticatorINI' 2013-10-27 09:04:39 +01:00
STRWarrior
cb06f35cb8 Changed "cIniFile IniFile" to cIniFile & IniFile" 2013-10-26 19:47:12 +02:00
madmaxoft
52f88b9595 Merge branch 'IniFileCleanup' 2013-10-26 19:43:34 +02:00
STRWarrior
77661f4c59 Both the LoadWorlds() function and cAuthenticator now use the cIniFile object from the Root::Start() function. 2013-10-26 17:08:28 +02:00
Samuel Barney
6c30ce93da Disabling Endermen and spiders until I rework the CanSpawnHere to take a chunk and a position. 2013-10-26 03:51:56 -06:00
Samuel Barney
0b853dca93 Moving spawning position to the center of the block. 2013-10-26 03:50:34 -06:00
Samuel Barney
6f0d15b448 Checked Endermen; they work; adding them back in. 2013-10-25 12:15:10 -06:00
Samuel Barney
4e024f5d87 Fixed mob spawning so that hostile mobs will not spawn incorrectly. 2013-10-25 11:50:46 -06:00
madmaxoft
323ebf119f cIniFile: Renamed functions to make meaning more explicit. 
For example KeyComment() -> GetKeyComment() / AddKeyComment()
 2013-10-25 11:38:14 +02:00
madmaxoft
9e9198e090 cIniFile doesn't store filename internally anymore. 2013-10-25 11:15:44 +02:00
madmaxoft
86bec4c57c cMonster: Improved doxycomments. 2013-10-25 10:41:19 +02:00
madmaxoft
5331555708 Renamed cMonster::GetSpawnRate() to GetSpawnDelay(). 2013-10-24 16:45:13 +02:00
madmaxoft
99d369d837 cPickup cleanup. 2013-10-24 16:44:25 +02:00
madmaxoft
625c5f86de Fixed cPickup's constructor's parameter naming. 2013-10-24 15:05:23 +02:00
madmaxoft
eca6955a2d Cleanup in cPlayer. 2013-10-24 12:24:40 +02:00
madmaxoft
d359c5a2fe Unified cPlayer's Heal() function with cEntity's. 2013-10-24 12:24:39 +02:00
Alexander Harkness
54f5f71c9a Merge pull request #286 from tigerw/pickupdelay 
Pickups now have collection delay when vomited
 2013-10-23 23:36:25 -07:00
Samuel Barney
00480a1d9a Using provided UnboundedRelGetBlockBlockLight and UnboundedRelGetBlockSkyLight. 2013-10-23 17:51:14 -06:00
Samuel Barney
4666c1bf30 Merge branch 'master' of https://github.com/SamJBarney/MCServer into MobSpawning 2013-10-23 17:41:36 -06:00
Samuel Barney
f558f3c6d2 Removed my hackish Light functions 2013-10-23 17:41:24 -06:00
Tiger Wang
4d2c810c64 Pickups now have collection delay when vomited 
Implements FS#394.
 2013-10-24 00:30:20 +01:00
Tiger Wang
442c428f5b TNT Spawns Pickups 
Fixes FS#397.
 2013-10-23 23:40:59 +01:00
madmaxoft
88db43e8d3 Fixed cLuaWindow's binding. 
No longer exporting multiple inheritance.
 2013-10-23 13:31:04 +02:00
madmaxoft
b8a2793228 Fixed bindings for cHopperEntity:GetOutputBlockPos(). 2013-10-23 12:09:11 +02:00
madmaxoft
90bea6a914 Fixed cDropSpenserEntity bindings generating an extra var. 
Caused by inadvertently exporting multiple-inheritance from a class that is not Lua-exported.
 2013-10-23 11:17:16 +02:00
madmaxoft
730195c47e Exported cHopperEntity to API. 
This allows hoppers to be created by plugins during chunk generation.
 2013-10-23 11:12:04 +02:00
madmaxoft
d3db97301b Removed cRoot:m_PrimaryServerVersion from Lua API. 
We have the accessor methods for it.
 2013-10-23 11:06:39 +02:00
Samuel Barney
228ccc5c6a Bats only spawn where there is no sunlight, and the light level is below 5 2013-10-22 17:11:38 -06:00
Samuel Barney
d6d73a1754 Invalid light value is now 127 2013-10-22 17:10:32 -06:00
madmaxoft
0152a6ffb4 Temporary fix for world not locking chunkmap in TickMobs. 
Reported as #283; this is a hotfix only.
 2013-10-22 18:30:26 +02:00
madmaxoft
4cf0862c12 Fixed an assert in cMonster 2013-10-22 17:54:23 +02:00
madmaxoft
76ed2f441a Implemented UnboundedRel BlockLight and SkyLight. 
Also unified the various UnboundedRel operations to use the same underlying structure.
 2013-10-22 17:54:09 +02:00
Samuel Barney
6e361f195f Added two new unbounded del functions to deal with looking up the lighting. 2013-10-21 14:38:38 -06:00
madmaxoft
3a95aad523 Added ASSERTs to all ChunkDef operations. 
This should avoid errors such as #276.
 2013-10-21 21:38:31 +02:00
Samuel Barney
56fa632d5e Swapped which block is checked for light first. 2013-10-21 10:03:05 -06:00
Samuel Barney
d73a0cd8b0 Current Mob Spawning code. 2013-10-21 09:41:48 -06:00
madmaxoft
5174d9cbd6 Fixed GetHTMLEscapedString() binding, removed obsolete memory function from API. 2013-10-21 13:22:47 +02:00
madmaxoft
b6741865f2 Fixed memory leak in cMobFamilyCollecter. 2013-10-20 14:16:21 +02:00
madmaxoft
d8576a7953 Reimplemented cMonster::FamilyFromType() as a simple switch (duh!) 2013-10-20 14:15:55 +02:00
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