Merge remote-tracking branch 'upstream/main' into linux-clang-support

# Conflicts:
#	Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
This commit is contained in:
ryleu 2026-03-30 15:57:13 -05:00
commit 7dd1e75b33
No known key found for this signature in database
21 changed files with 653 additions and 49 deletions

View file

@ -218,10 +218,12 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
if (extend && param1 == TRIGGER_CONTRACT)
{
level->setData(x, y, z, facing | EXTENDED_BIT, UPDATE_CLIENTS);
ignoreUpdate(false);
return false;
}
else if (!extend && param1 == TRIGGER_EXTEND)
{
ignoreUpdate(false);
return false;
}
}
@ -247,6 +249,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
}
else
{
ignoreUpdate(false);
return false;
}
PIXEndNamedEvent();