diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-10-31 08:10:05 +1100 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-10-31 08:10:05 +1100 |
commit | 7d948f88393c504a77045461b210607d3da2aac9 (patch) | |
tree | 38a45fcf67de864fc3a9dcb192852e0d93b9c0db /source/game/StarWorldClient.cpp | |
parent | 332fb8430b5f50b0f25b806c1d5e3a74dac55eec (diff) |
Don't tile predict falling blocks for now
causes too many mispredictions due to not simulating falling blocks locally (and it might still be an issue even if we did simulate it due to slight timing differences between client/server)
Diffstat (limited to 'source/game/StarWorldClient.cpp')
-rw-r--r-- | source/game/StarWorldClient.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/game/StarWorldClient.cpp b/source/game/StarWorldClient.cpp index b2eda12..8b12a6f 100644 --- a/source/game/StarWorldClient.cpp +++ b/source/game/StarWorldClient.cpp @@ -2268,12 +2268,16 @@ void WorldClient::informTilePrediction(Vec2I const& pos, TileModification const& p.time = now; if (auto placeMaterial = modification.ptr<PlaceMaterial>()) { if (placeMaterial->layer == TileLayer::Foreground) { - p.foreground = placeMaterial->material; - p.foregroundHueShift = placeMaterial->materialHueShift; + auto materialDatabase = Root::singleton().materialDatabase(); + if (!materialDatabase->isCascadingFallingMaterial(placeMaterial->material) + && !materialDatabase-> isFallingMaterial(placeMaterial->material)) { + p.foreground = placeMaterial->material; + p.foregroundHueShift = placeMaterial->materialHueShift; + } if (placeMaterial->collisionOverride != TileCollisionOverride::None) p.collision = collisionKindFromOverride(placeMaterial->collisionOverride); else - p.collision = Root::singleton().materialDatabase()->materialCollisionKind(placeMaterial->material); + p.collision = materialDatabase->materialCollisionKind(placeMaterial->material); dirtyCollision(RectI::withSize(pos, { 1, 1 })); } else { p.background = placeMaterial->material; |