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/Entities/Pickup.h | |
| 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/Entities/Pickup.h')
| -rw-r--r-- | src/Entities/Pickup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h index b03ae0846..e8184e8af 100644 --- a/src/Entities/Pickup.h +++ b/src/Entities/Pickup.h @@ -26,7 +26,7 @@ public: // tolua_export CLASS_PROTODEF(cPickup) - cPickup(Vector3d a_Position, cItem && a_Item, Vector3d a_Speed, cTickTime a_CollectionDelay, cTickTime a_Lifetime); + cPickup(Vector3d a_Position, cItem && a_Item, Vector3d a_Speed, cTickTime a_CollectionDelay, cTickTime a_Lifetime, bool a_CanCombine); cItem & GetItem(void) {return m_Item; } // tolua_export const cItem & GetItem(void) const {return m_Item; } |