flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Pickup spawn improvements (#4525)

Browse Source 
Pickups are now thrown around when spawned, like in vanilla. Pickups also bail out of the collision detection checks while being created, to prevent them from blasting too far off in e.g. cobblestone generators.
This commit is contained in:
Mat 2020-03-23 02:05:47 +02:00 committed by GitHub
parent 41e09484b7
commit 7700116330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Entity.cpp
View File

@ -972,7 +972,7 @@ void cEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
} }
} }
} }
else if (!(IsMinecart() || IsTNT())) else if (!(IsMinecart() || IsTNT() || (IsPickup() && (m_TicksAlive < 15))))
{ {
// Push out entity. // Push out entity.
BLOCKTYPE GotBlock; BLOCKTYPE GotBlock;

8
src/World.cpp
View File

@ -1974,9 +1974,9 @@ void cWorld::SpawnItemPickups(const cItems & a_Pickups, Vector3d a_Pos, double a
continue; continue;
} }
float SpeedX = static_cast<float>(a_FlyAwaySpeed * Random.RandInt(-5, 5)); float SpeedX = static_cast<float>(a_FlyAwaySpeed * Random.RandInt(-10, 10));
float SpeedY = static_cast<float>(a_FlyAwaySpeed * Random.RandInt(50)); float SpeedY = static_cast<float>(a_FlyAwaySpeed * Random.RandInt(40, 50));
float SpeedZ = static_cast<float>(a_FlyAwaySpeed * Random.RandInt(-5, 5)); float SpeedZ = static_cast<float>(a_FlyAwaySpeed * Random.RandInt(-10, 10));
auto Pickup = cpp14::make_unique<cPickup>(a_Pos, *itr, a_IsPlayerCreated, Vector3f{SpeedX, SpeedY, SpeedZ}); auto Pickup = cpp14::make_unique<cPickup>(a_Pos, *itr, a_IsPlayerCreated, Vector3f{SpeedX, SpeedY, SpeedZ});
auto PickupPtr = Pickup.get(); auto PickupPtr = Pickup.get();
@ -2226,7 +2226,7 @@ bool cWorld::DropBlockAsPickups(Vector3i a_BlockPos, const cEntity * a_Digger, c
{ {
return false; return false;
} }
SpawnItemPickups(pickups, Vector3d(0.5, 0.5, 0.5) + a_BlockPos); SpawnItemPickups(pickups, Vector3d(0.5, 0.5, 0.5) + a_BlockPos, 10);
return true; return true;
} }