Merge pull request #5290 from kandera/fix_blink

fix blink making you fall under ground when blinking into water (needs c...
closes #5289
This commit is contained in:
Subv
2012-02-18 04:36:23 -08:00
+1 -1
View File
@@ -1556,7 +1556,7 @@ float Map::GetWaterOrGroundLevel(float x, float y, float z, float* ground /*= NU
LiquidData liquid_status; LiquidData liquid_status;
ZLiquidStatus res = getLiquidStatus(x, y, ground_z, MAP_ALL_LIQUIDS, &liquid_status); ZLiquidStatus res = getLiquidStatus(x, y, ground_z, MAP_ALL_LIQUIDS, &liquid_status);
return res ? ( swim ? liquid_status.level - 2.0f : liquid_status.level) : ground_z; return res ? liquid_status.level : ground_z;
} }
return VMAP_INVALID_HEIGHT_VALUE; return VMAP_INVALID_HEIGHT_VALUE;