1
0
Commit Graph

133 Commits

Author SHA1 Message Date
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
e62cac07c0 Merge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata. 2013-10-13 18:26:45 +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
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
Tiger Wang
e2aaf202ab Fifth round of fixes
* Enumerated Villager spawning
2013-10-11 20:57:22 +01:00
Tiger Wang
fe6fa23a97 Second round of fixes
* Implemented suggestions
2013-10-09 21:02:59 +01:00
madmaxoft
55999ee118 Moved cMakeDir::MakeDir to cFile::CreateFolder.
And exported to Lua.
2013-10-09 09:57:48 +02: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
mgueydan
ac4cb65b8d Merge branch 'master' into MobSpawning 2013-09-22 14:29:33 +02:00
madmaxoft
91325d706d Linux compilation fix #3. 2013-09-21 11:18:37 +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
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
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
6dbe3296e0 Fixed codepage conversion 2013-09-10 22:03:11 +02:00
Tiger Wang
30ac3f5838 Added a few changes [SEE DESC]
* Revised pickup comments
* SlotArea pickup tossing now reflects Player.cpp
* Removed unneeded ItemShears comment (was working already)
* Sand and gravel pickups spawn with correct speed
2013-09-09 19:28:50 +01:00
mgueydan
d67e8dcca5 Adding mobtype filter inside world.ini 2013-09-08 03:30:09 +02:00
mgueydan
7a5e3592ff Adding glue to call everything done in last commits - now the mobs are spawning 2013-09-08 02:47:02 +02:00
mgueydan
04151677d5 Disabeling current mob spawning and tick 2013-09-08 01:43:55 +02:00
mgueydan
d2eb58f277 Adding mob census (sorry this is a big commit as work was done before git integration i couldn't split it more) 2013-09-07 22:19:56 +02:00
mgueydan
2361a5dc41 relockating mobs includes (they probably will end somewhere else in order not to recompile world each time you update a mob) 2013-09-07 20:07:56 +02:00
madmaxoft
3b1c83acf8 Renamed cWorld::DoExplosiontAt() to cWorld::DoExplosionAt() 2013-09-07 18:12:22 +02:00
Tiger Wang
ad89a0d460 Pickups spawn with correct speed and position
Added a comment-space as well.
2013-09-04 18:26:00 +01:00
madmaxoft
83811b6929 Merged branch 'master' into Projectiles. 2013-08-25 17:06:51 +02:00
madmaxoft
de3aae5c75 Slight performance improvement in cWorld::FindClosestPlayer() 2013-08-24 22:43:17 +02:00
madmaxoft
73afb1507d Added skeleton code for projectile spawning. 2013-08-22 08:55:58 +02:00
madmaxoft
fdbe835131 Fixed WorldTickThread reporting wrong time durations for each tick.
This had caused food eating to fail and players unable to collect pickups on Linux.
2013-08-19 22:23:25 +02:00
madmaxoft
1a7912744f Moved entities into the Entities subfolder. 2013-08-19 11:39:13 +02:00
madmaxoft
dd030fa892 Implemented the OnWorldTick hook.
Triggerred for each world every time it ticks, parameters are the cWorld and the previous tick length (a_Dt)
2013-08-19 09:28:22 +02:00
madmaxoft
7b10068370 Implemented cWorld:QueueSetBlock(), as requested for delayed blocksetting.
Untested yet, so might not work.
2013-08-18 22:44:22 +02:00
madmaxoft
861d5c75c9 Removed SetServerBlock griefing. 2013-08-18 20:00:50 +02:00
Tiger Wang
8a3174164b Properly fixed piston non-animation
Fixes #57
2013-08-18 14:52:38 +01:00
Tiger Wang
9e0b8b5bee Enhancements to Tabcompletion and Compile Fix
Tab complete now finds the last word and matches accordingly, with a 20%
increase in speed!
Fixed missing comma breaking compilation
2013-08-18 11:58:19 +01:00
Tiger Wang
679085b520 Bugfix Update [SEE DESC}
Added stained clay, coal block, and hardened clay Block IDs
Added stained clay and carpet block Metas
Fixed bug with sticky retract bailing out but not unsetting arm
Fixed autocomplete not working when not at the first character, fixes
#64
Added furnace recipes for hardened clay and coal and coal blocks
2013-08-18 00:33:14 +01:00
madmaxoft
0cb00996de Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX.
Also slightly improved the spawning algorithm.
2013-08-16 10:48:30 +02:00
Mattes D
1a52e89177 Merge pull request #93 from mc-server/PerWorldThreads
Per world threads
2013-08-15 01:56:52 -07:00
Tiger Wang
d4f8a057dd Generation and simulation defaults
...are no longer set, instead, the server operator is told to set them.
2013-08-14 22:26:15 +01:00
madmaxoft
f93d13c419 Fixed world's a_Dt parameter getting time values in wrong units. 2013-08-14 22:36:34 +02:00
madmaxoft
e2ff4a2e5c Clients are deleted when the world is stopped.
This fixes #92.
2013-08-14 19:56:29 +02:00
madmaxoft
f8757d3606 Fixed crashes in world's clientlist manipulators 2013-08-14 13:43:55 +02:00
Tiger Wang
303b1a9c45 Buncha bugfixes [SEE DESC]
Fixed generation values not being written
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
Removed problematic piston code
2013-08-14 11:44:02 +01:00