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

Properly deprecate more XYZ parameter'd functions (#5147)

Browse Source 
* Fixes #5144
This commit is contained in:
Tiger Wang
2021-03-15 02:28:18 +00:00
committed by GitHub
parent c729d7abde
commit 45591cbe7b
22 changed files with 530 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Entities/Entity.cpp
View File

@@ -1308,7 +1308,7 @@ void cEntity::DetectCacti(void)
{
for (int y = MinY; y <= MaxY; y++)
{
if (GetWorld()->GetBlock(x, y, z) == E_BLOCK_CACTUS)
if (GetWorld()->GetBlock({ x, y, z }) == E_BLOCK_CACTUS)
{
TakeDamage(dtCactusContact, nullptr, 1, 0);
return;
@@ -1337,7 +1337,7 @@ void cEntity::DetectMagma(void)
{
for (int y = MinY; y <= MaxY; y++)
{
if (GetWorld()->GetBlock(x, y, z) == E_BLOCK_MAGMA)
if (GetWorld()->GetBlock({ x, y, z }) == E_BLOCK_MAGMA)
{
TakeDamage(dtMagmaContact, nullptr, 1, 0);
return;
@@ -1367,10 +1367,9 @@ bool cEntity::DetectPortal()
return false;
}
int X = POSX_TOINT, Y = POSY_TOINT, Z = POSZ_TOINT;
if (cChunkDef::IsValidHeight(Y))
if (const auto Position = m_Position.Floor(); cChunkDef::IsValidHeight(Position.y))
{
switch (GetWorld()->GetBlock(X, Y, Z))
switch (GetWorld()->GetBlock(Position))
{
case E_BLOCK_NETHER_PORTAL:
{