diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-06-13 21:35:30 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2017-06-13 21:35:30 +0200 |
| commit | 360d8eade0332f2c1aa5c205ca772cd506c35b26 (patch) | |
| tree | 066fde557310742a39020bad9bc4aa2a5ef8d51a /src/Entities/Entity.cpp | |
| parent | Corrected check for level of subcommand and fixed multiple levels not working (#3758) (diff) | |
| download | cuberite-360d8eade0332f2c1aa5c205ca772cd506c35b26.tar cuberite-360d8eade0332f2c1aa5c205ca772cd506c35b26.tar.gz cuberite-360d8eade0332f2c1aa5c205ca772cd506c35b26.tar.bz2 cuberite-360d8eade0332f2c1aa5c205ca772cd506c35b26.tar.lz cuberite-360d8eade0332f2c1aa5c205ca772cd506c35b26.tar.xz cuberite-360d8eade0332f2c1aa5c205ca772cd506c35b26.tar.zst cuberite-360d8eade0332f2c1aa5c205ca772cd506c35b26.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index db70044b4..5d26f501b 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -495,12 +495,11 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI) { int Chance = static_cast<int>(ThornsLevel * 15); - cFastRandom Random; - int RandomValue = Random.GenerateRandomInteger(0, 100); + auto & Random = GetRandomProvider(); - if (RandomValue <= Chance) + if (Random.RandBool(Chance / 100.0)) { - a_TDI.Attacker->TakeDamage(dtAttack, this, 0, Random.GenerateRandomInteger(1, 4), 0); + a_TDI.Attacker->TakeDamage(dtAttack, this, 0, Random.RandInt(1, 4), 0); } } @@ -574,8 +573,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI) TotalEPF = 25; } - cFastRandom Random; - float RandomValue = Random.GenerateRandomInteger(50, 100) * 0.01f; + float RandomValue = GetRandomProvider().RandReal(0.5f, 1.0f); TotalEPF = ceil(TotalEPF * RandomValue); |