summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorchangyong guo <guo1487@163.com>2018-08-02 16:59:10 +0200
committerpeterbell10 <peterbell10@live.co.uk>2018-08-02 16:59:10 +0200
commit57690b81a24a29d70cb6f4196a6e0f521a3cb61b (patch)
treeac40e460dd92c9fe8a9554b0815684b67ecf2e11 /src/World.cpp
parentOcelots no longer multiply exponentially (#4272) (diff)
downloadcuberite-57690b81a24a29d70cb6f4196a6e0f521a3cb61b.tar
cuberite-57690b81a24a29d70cb6f4196a6e0f521a3cb61b.tar.gz
cuberite-57690b81a24a29d70cb6f4196a6e0f521a3cb61b.tar.bz2
cuberite-57690b81a24a29d70cb6f4196a6e0f521a3cb61b.tar.lz
cuberite-57690b81a24a29d70cb6f4196a6e0f521a3cb61b.tar.xz
cuberite-57690b81a24a29d70cb6f4196a6e0f521a3cb61b.tar.zst
cuberite-57690b81a24a29d70cb6f4196a6e0f521a3cb61b.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp63
1 files changed, 60 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 0c4618606..c832f7386 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2298,6 +2298,49 @@ UInt32 cWorld::SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Rewa
+std::vector<UInt32> cWorld::SpawnSplitExperienceOrbs(double a_X, double a_Y, double a_Z, int a_Reward)
+{
+ std::vector<UInt32> OrbsID;
+
+ if (a_Reward < 1)
+ {
+ LOGWARNING("%s: Attempting to create an experience orb with non-positive reward!", __FUNCTION__);
+ return OrbsID;
+ }
+
+ std::vector<int> Rewards = cExpOrb::Split(a_Reward);
+
+ // Check generate number to decide speed limit (distribute range)
+ float SpeedLimit = (Rewards.size() / 2) + 5;
+ if (SpeedLimit > 10)
+ {
+ SpeedLimit = 10;
+ }
+
+ auto & Random = GetRandomProvider();
+ for (auto Reward : Rewards)
+ {
+ auto ExpOrb = cpp14::make_unique<cExpOrb>(a_X, a_Y, a_Z, Reward);
+ auto ExpOrbPtr = ExpOrb.get();
+ double SpeedX = Random.RandReal(-SpeedLimit, SpeedLimit);
+ double SpeedY = Random.RandReal(0.5);
+ double SpeedZ = Random.RandReal(-SpeedLimit, SpeedLimit);
+ ExpOrbPtr->SetSpeed(SpeedX, SpeedY, SpeedZ);
+
+ UInt32 Id = ExpOrbPtr->GetUniqueID();
+ if (ExpOrbPtr->Initialize(std::move(ExpOrb), *this))
+ {
+ OrbsID.push_back(Id);
+ }
+ }
+
+ return OrbsID;
+}
+
+
+
+
+
UInt32 cWorld::SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType, const cItem & a_Content, int a_BlockHeight)
{
std::unique_ptr<cMinecart> Minecart;
@@ -2817,9 +2860,9 @@ bool cWorld::DoWithPlayerByUUID(const cUUID & a_PlayerUUID, cPlayerListCallback
-cPlayer * cWorld::FindClosestPlayer(Vector3d a_Pos, float a_SightLimit, bool a_CheckLineOfSight)
+bool cWorld::DoWithNearestPlayer(Vector3d a_Pos, double a_RangeLimit, cPlayerListCallback a_Callback, bool a_CheckLineOfSight, bool a_IgnoreSpectator)
{
- double ClosestDistance = a_SightLimit;
+ double ClosestDistance = a_RangeLimit;
cPlayer * ClosestPlayer = nullptr;
cCSLock Lock(m_CSPlayers);
@@ -2829,6 +2872,12 @@ cPlayer * cWorld::FindClosestPlayer(Vector3d a_Pos, float a_SightLimit, bool a_C
{
continue;
}
+
+ if (a_IgnoreSpectator && (*itr)->IsGameModeSpectator())
+ {
+ continue;
+ }
+
Vector3f Pos = (*itr)->GetPosition();
double Distance = (Pos - a_Pos).Length();
@@ -2850,7 +2899,15 @@ cPlayer * cWorld::FindClosestPlayer(Vector3d a_Pos, float a_SightLimit, bool a_C
ClosestDistance = Distance;
ClosestPlayer = *itr;
}
- return ClosestPlayer;
+
+ if (ClosestPlayer)
+ {
+ return a_Callback(*ClosestPlayer);
+ }
+ else
+ {
+ return false;
+ }
}