diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2022-07-11 00:56:25 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2022-07-19 23:33:09 +0200 |
| commit | 284f54ed81186d3122b994db7395e870703efb4f (patch) | |
| tree | 51a4b5c4a7e9fdde460c84117ea8f9ea6ed97393 /src/World.cpp | |
| parent | Move LineBlockTracer into Physics (diff) | |
| download | cuberite-284f54ed81186d3122b994db7395e870703efb4f.tar cuberite-284f54ed81186d3122b994db7395e870703efb4f.tar.gz cuberite-284f54ed81186d3122b994db7395e870703efb4f.tar.bz2 cuberite-284f54ed81186d3122b994db7395e870703efb4f.tar.lz cuberite-284f54ed81186d3122b994db7395e870703efb4f.tar.xz cuberite-284f54ed81186d3122b994db7395e870703efb4f.tar.zst cuberite-284f54ed81186d3122b994db7395e870703efb4f.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp index 35f41d389..da73b46bd 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -12,7 +12,7 @@ #include "Generating/ComposableGenerator.h" #include "SetChunkData.h" #include "DeadlockDetect.h" -#include "LineBlockTracer.h" +#include "Physics/Tracers/LineBlockTracer.h" #include "UUID.h" #include "BlockInServerPluginInterface.h" @@ -1844,7 +1844,7 @@ void cWorld::SpawnItemPickups(const cItems & a_Pickups, Vector3d a_Pos, Vector3d UInt32 cWorld::SpawnItemPickup(Vector3d a_Position, cItem && a_Item, Vector3d a_Speed, cTickTime a_CollectionDelay, cTickTime a_Lifetime, bool a_CanCombine) { - auto Pickup = std::make_unique<cPickup>(a_Position, std::move(a_Item), a_Speed, a_CollectionDelay, a_Lifetime); + auto Pickup = std::make_unique<cPickup>(a_Position, std::move(a_Item), a_Speed, a_CollectionDelay, a_Lifetime, a_CanCombine); auto PickupPtr = Pickup.get(); if (!PickupPtr->Initialize(std::move(Pickup), *this)) @@ -2413,7 +2413,7 @@ bool cWorld::DoWithNearestPlayer(Vector3d a_Pos, double a_RangeLimit, cPlayerLis // Check LineOfSight, if requested: if ( a_CheckLineOfSight && - !cLineBlockTracer::LineOfSightTrace(*this, a_Pos, Pos, cLineBlockTracer::losAirWater) + !LineBlockTracer::LineOfSightTrace(*this, a_Pos, Pos, LineBlockTracer::LineOfSight::AirWater) ) { continue; |