1
0
Commit Graph

122 Commits

Author SHA1 Message Date
madmaxoft
7567f19052 Merge branch 'master' of git://github.com/nesco/MCServer. 2013-11-19 10:01:25 +01:00
nesco
416292a824 Blank Line added 2013-11-17 17:41:58 +01:00
nesco
c868d31377 Update Giant.cpp 2013-11-15 14:06:58 +01:00
nesco
8fa4f38202 Update Giant.cpp 2013-11-14 23:15:19 +01:00
madmaxoft
a8cf6edab0 Merge remote-tracking branch 'origin/WolfUpdate'
Conflicts:
	source/Mobs/Wolf.h
2013-11-13 22:38:34 +01:00
madmaxoft
293051eca8 Merge remote-tracking branch 'origin/fixes'. 2013-11-13 11:08:51 +01:00
STRWarrior
1eb2b7e176 Now using a TickFollowPlayer function. 2013-11-12 16:39:59 +01:00
Tiger Wang
f713780db3 Bundled fixes [SEE DESC]
* Fixed compiler warning in Monster.cpp
* Future proofed particle effects
* Improved pickups, made less jittery
2013-11-10 22:20:25 +00:00
Mattes D
3a692d53e8 Merge pull request #330 from tonibm19/patch-1
Added sheep dyeing
2013-11-10 13:04:27 -08:00
STRWarrior
165f68b8d9 Removed #include "../Root.h" since it isn't needed. 2013-11-10 21:59:38 +01:00
STRWarrior
1682c61b59 Removed #include "../Root.h" since it isn't needed. 2013-11-10 21:56:37 +01:00
madmaxoft
dadae874f2 Small code-style fixes. 2013-11-10 21:55:32 +01:00
Tiger Wang
71abbb2f56 Bundled fixes [SEE DESC]
* Fixed pickups spawning in an incorrect position from a JukeBox
* Pickups make a popping sound in Prtcl1.7
* Arrows make a *what sort of sound does an arrow make anyway‽* when
hitting a block, and a popping sound when fired
* Mobs again have metadata
* Fixed Prtcl1.7 not using valid JSON to kick a client
* Minecarts and arrows again have metadata
2013-11-10 20:48:12 +00:00
STRWarrior
2ccf9b2b32 Renamed variables in cWolf. 2013-11-10 21:24:36 +01:00
STRWarrior
e62858ec3d Using DoWithPlayer instead of FindAndDoWithPlayer for callbacks.
You are able to dye the collar.
2013-11-10 20:12:30 +01:00
STRWarrior
4f11cd2f8a The owner object isn't stored anymore. Instead we use the name of the player.
This means only players can now have a wolf, but it fixes the bug where when you log out the wolf isn't your wolf anymore.
2013-11-10 18:03:19 +01:00
tonibm19
4af5868322 Fixes (SEE DESC)
Entity metadata is broadcasted.
If player is in survival, his equipped item is removed.
If you have green dye, and sheep is green, your equipped item won't be removed.
2013-11-10 17:05:19 +01:00
tonibm19
da5bd81836 STR_Warrior was right.
Simplified code.
2013-11-10 16:48:22 +01:00
tonibm19
e2b4745bbf Fixed compilation 2013-11-10 16:43:47 +01:00
tonibm19
9da4011a7f You can no longer color with wood 2013-11-10 16:42:38 +01:00
tonibm19
e919496025 Added sheep dyeing 2013-11-10 16:03:00 +01:00
STRWarrior
0980567912 Using cMonster::Tick instead of super::cMonster::Tick 2013-11-10 15:51:32 +01:00
STRWarrior
38f6fff3fb Wolves can now be owned by an entity.
They only sit when right clicked by their owner.
They beg if the closest player has meat or bones in his hand.
They follow their owner.
They teleport to their owner if they are more then 30 blocks away.
They don't attack players if they are not angry anymore.
They don't move if they are sitting.
2013-11-10 15:16:43 +01:00
madmaxoft
b24bdff308 Fixed code style. 2013-11-08 21:06:31 +01:00
tonibm19
705e6c1301 Changed variable name 2013-11-08 17:16:36 +01:00
tonibm19
2cf93b8e25 Changed variable name 2013-11-08 17:15:28 +01:00
tonibm19
20d9886847 Now chicken drop eggs 2013-11-08 14:04:41 +01:00
tonibm19
4d7695549a Now chickens can drop eggs.
They drop an egg every 5 or 10 minutes.
2013-11-08 14:04:00 +01:00
Mattes D
e65ce13012 Merge pull request #307 from mc-server/MobImprovements
Mob projectiles
2013-11-05 08:22:31 -08:00
STRWarrior
c84bd79eff Fixed indentation. 2013-11-05 16:24:54 +01:00
STRWarrior
7cfcfc5f39 Skeleton, Ghast and Blaze's projectile code is now in their respective class. 2013-11-04 21:46:56 +01:00
STRWarrior
6f0f620cf8 Skeleton.cpp doesn't have to load ProjectileEntity.h and Entity.h. 2013-11-02 21:32:55 +01:00
STRWarrior
58ced0c12c Skeletons, Blazes and Ghasts now shoot their projectile to the target. 2013-11-02 20:47:43 +01:00
STRWarrior
3dc3e5eca7 Zombies and Skeletons don't walk into the sun anymore. 2013-11-02 20:45:51 +01:00
Mattes D
8b9d3c7722 Merge pull request #292 from SamJBarney/MobSpawning
Mob Spawning based on light values
2013-10-30 15:25:51 -07:00
Mattes D
a0c2981a3c Merge pull request #299 from tonibm19/master
Saddles are dropped, chicken spawn out of thrown eggs.
2013-10-29 14:03:49 -07:00
STRWarrior
52d956ccf3 Changed GameMode() == 1 to IsGameModeCreative in AggressiveMonster.cpp and ClientHandle.cpp 2013-10-29 21:45:31 +01:00
Samuel Barney
e1a06153b2 Update to allow the light map to remain the same, but allow alteration of sky light values based on time. 2013-10-29 10:44:51 -06:00
tonibm19
1ff051c9a3 Now saddled horses spawn a saddle pickup when killed 2013-10-28 20:28:16 +01:00
tonibm19
5a723454a9 Now saddle pigs spawn a saddle pickup when killed 2013-10-28 20:27:05 +01:00
madmaxoft
1eac38f3d7 Fixed indentation in tonibm19's code. 2013-10-28 19:54:03 +01:00
tonibm19
984277f65e Fixed compilation
STR_Warrior code had an error (I copied&pasted it before)
2013-10-28 19:47:38 +01:00
tonibm19
6e554c3b52 Use STR_Warrior code and changed variable name 2013-10-28 19:42:02 +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
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
4cf0862c12 Fixed an assert in cMonster 2013-10-22 17:54:23 +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