1
0
Commit Graph

346 Commits

Author SHA1 Message Date
archshift
9e8361976b Entity Effects: Clarified user, added it to AddEntityEffect
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
madmaxoft
e289fe4dd7 Changed the AddEntityEffect() params for easier calls. 2014-06-17 11:39:21 -07:00
archshift
22761bb6ad Entity Effect: Separates total duration and ticks of activity
Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter
2014-06-17 11:39:21 -07:00
madmaxoft
045ae2ef2c Fixed MSVC compilation. 2014-06-17 11:39:21 -07:00
archshift
5b2b6e0615 Pawn: renamed HandleEntityEffects to HandleEntityEffect
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift
71b4c49490 Cave spider now poisons its victim, added IsPawn function to Entity 2014-06-17 11:39:21 -07:00
archshift
814cdca054 Added wither damage type, wither entity effect. 2014-06-17 11:39:21 -07:00
archshift
2574573c88 Monster: added IsUndead(), undead-specific entity effects 2014-06-17 11:39:20 -07:00
archshift
52abd90a28 Applies splash potion effects to mobs as well as players 2014-06-17 11:39:20 -07:00
archshift
68011a004a Removed long function wrapping 2014-06-17 11:39:20 -07:00
archshift
73cea7065d Entity effect type: use 'eff' as a prefix instead of 'ef' 2014-06-17 11:39:20 -07:00
archshift
58f35af6e7 Added splash potion functionality 2014-06-17 11:39:20 -07:00
archshift
5803094d7d Entity: only fire critical hit if damage type is physical 2014-06-17 11:39:20 -07:00
archshift
8eceaf9b0c Player: made healing instantaneous 2014-06-17 11:39:20 -07:00
archshift
2185c72c2c Implemented drinkable potions, noeffect entity effect,
Clears entity effects on death
2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee Implemented milk, added documentation to Pawn.h 2014-06-17 11:39:19 -07:00
archshift
615152eb8c Pawn.cpp: fixed effect iterator BAD_ACCESS
Erasure was occurring before the iterator increased, causing a bad access. Solved by storing map pairs in variables and manually updating iterator before erasure.

Fixed mix-up in function arguments on food poisoning
2014-06-17 11:39:19 -07:00
archshift
e98ffccd80 Pawn: Enabled entity effect broadcast, added typedef
Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap
2014-06-17 11:39:19 -07:00
archshift
a9a4c9c6b2 EntityEffect: read-only getters, added user and distance modifier fields
User: the pawn that uses or produces the entity effect (drinks/throws a potion)
Distance modifier: the potency modifier from splash potion effectivity radius
2014-06-17 11:39:19 -07:00
archshift
2123173202 Player: Removed food-poisoning-specific code, set duration to 30 seconds
http://minecraft.gamepedia.com/Hunger#Behavior
2014-06-17 11:39:19 -07:00
archshift
481f05b011 Entity effects: Added handlers for entity effects
Implemented hunger, instant health, damage, poison, regen

Added "template" entity effect implementations
2014-06-17 11:39:19 -07:00
archshift
90145a9514 Added iterator on tick to manage entity effect duration 2014-06-17 11:17:33 -07:00
archshift
aa7b3f33b9 cPawn: Remove unused m_bBurnable 2014-06-17 11:17:33 -07:00
archshift
87b1bfaf2a Moved Effects.h to EntityEffects.h, added initial impl 2014-06-17 11:17:32 -07:00
archshift
c1692a2e3b Added classes for splash potions and wither skulls 2014-06-17 11:17:32 -07:00
Tycho
ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d Added queue for adding entities to cWorld.
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
Howaner
33fbdedea3 Fix itemframe break. 2014-06-04 15:16:30 +02:00
madmaxoft
c0015d01c6 Player permissions aren't logged to console anymore.
This was only logspam on most servers and there are alternative ways to list players' permissions.
2014-06-03 19:50:27 +02:00
Mattes D
61edb83ce5 Merge pull request #844 from mc-server/ProjectileHitBlock
OnProjectileHitBlock tweak.
2014-06-01 20:10:03 +02:00
STRWarrior
d1b23060ad Used recommendations 2014-05-31 14:14:55 +02:00
Mattes D
0b758946ac Merge pull request #951 from worktycho/chunksparsing/structs
Chunksparsing with segments
2014-05-31 10:12:54 +02:00
Tiger Wang
f55f5ec47f Merge branch 'master' into achievementtranslate
Conflicts:
	src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
Tycho
4ab8288116 Merge branch 'master' into chunksparsing/structs 2014-05-24 12:44:49 +01:00
Mattes D
941cb88ae4 Fixed datatype conversion warning. 2014-05-23 12:33:30 +02:00
xdot
671c73c639 Merge pull request #1015 from mc-server/Stats
Statistics
2014-05-21 11:14:44 +03:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Alexander Harkness
507df71845 Update Player.cpp 2014-05-20 13:35:39 +01:00
Tiger Wang
2bfe962e28 Fixed a cactus Y position issue 2014-05-19 22:15:39 +01:00
Tiger Wang
4008af6925 Simplified cacti conditions 2014-05-19 21:17:28 +01:00
Tiger Wang
42c36429d7 Added client translation to achievements 2014-05-19 20:40:56 +01:00
Alexander Harkness
1de4408a18 Merge pull request #1010 from mc-server/cactidamage
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Alexander Harkness
6de0257bbe Derp 2014-05-19 13:31:19 +01:00
Alexander Harkness
dc39d88d3f Should have fixed assumptions about entity width.
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
Alexander Harkness
70cf4a5eaf Fixed clanging errors.
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01:00
Tiger Wang
6167c79e7a Implemented cacti damage
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +01:00
madmaxoft
a651c865e4 There's no "round" function in MSVC2008. 2014-05-18 22:49:27 +02:00
andrew
466ff2204f Fixes 2014-05-13 14:53:15 +03:00
andrew
aea866f5b1 Movement Statistics 2014-05-12 21:38:52 +03:00