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

Buckets: Be able to place fluids through other fluids. (#4331)

Browse Source
This commit is contained in:
Zach DeCook 2019-05-07 15:15:58 -04:00 committed by peterbell10
parent 8b4d37771f
commit b9e7505d7f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/LuaServerHandle.cpp
View File

@ -143,7 +143,7 @@ cTCPLink::cCallbacksPtr cLuaServerHandle::OnIncomingConnection(const AString & a
cCSLock Lock(m_CSConnections); cCSLock Lock(m_CSConnections);
m_Connections.push_back(res); m_Connections.push_back(res);
return res; return std::move(res);
} }

4
src/Items/ItemBucket.h
View File

@ -242,12 +242,12 @@ public:
virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, eBlockFace a_CBEntryFace) override virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, eBlockFace a_CBEntryFace) override
{ {
if (a_CBBlockType != E_BLOCK_AIR) if ((a_CBBlockType != E_BLOCK_AIR) && !IsBlockLiquid(a_CBBlockType))
{ {
m_ReplacedBlockType = a_CBBlockType; m_ReplacedBlockType = a_CBBlockType;
m_ReplacedBlockMeta = a_CBBlockMeta; m_ReplacedBlockMeta = a_CBBlockMeta;
m_EntryFace = static_cast<eBlockFace>(a_CBEntryFace); m_EntryFace = static_cast<eBlockFace>(a_CBEntryFace);
if (!cFluidSimulator::CanWashAway(a_CBBlockType) && !IsBlockLiquid(a_CBBlockType)) if (!cFluidSimulator::CanWashAway(a_CBBlockType))
{ {
AddFaceDirection(a_CBBlockX, a_CBBlockY, a_CBBlockZ, a_CBEntryFace); // Was an unwashawayable block, can't overwrite it! AddFaceDirection(a_CBBlockX, a_CBBlockY, a_CBBlockZ, a_CBEntryFace); // Was an unwashawayable block, can't overwrite it!
} }

2
src/Server.cpp
View File

@ -323,7 +323,7 @@ cTCPLink::cCallbacksPtr cServer::OnConnectionAccepted(const AString & a_RemoteIP
NewHandle->SetSelf(NewHandle); NewHandle->SetSelf(NewHandle);
cCSLock Lock(m_CSClients); cCSLock Lock(m_CSClients);
m_Clients.push_back(NewHandle); m_Clients.push_back(NewHandle);
return NewHandle; return std::move(NewHandle);
} }